Skip to content

Commit

Permalink
separate default target wrapper (#368)
Browse files Browse the repository at this point in the history
Complete the elimination of include/private/config/wrapper.h
by moving the remaining functions to their own wrapper header.

This fixes #293, which can be referenced for more information.
  • Loading branch information
rmknan authored Sep 17, 2023
1 parent 9fad9a2 commit 7a8c928
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
/* SPDX-License-Identifier: Apache-2.0 */

/*
* Copyright 2018-2022 Joel E. Anderson
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Copyright 2022 Joel E. Anderson
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef __STUMPLESS_PRIVATE_CONFIG_WRAPPER_H
# define __STUMPLESS_PRIVATE_CONFIG_WRAPPER_H
#ifndef __STUMPLESS_PRIVATE_CONFIG_WRAPPER_OPEN_DEFAULT_TARGET_H
# define __STUMPLESS_PRIVATE_CONFIG_WRAPPER_OPEN_DEFAULT_TARGET_H

# include <stumpless/config.h>


/* definition of config_open_default_target */
# ifdef STUMPLESS_WINDOWS_EVENT_LOG_TARGETS_SUPPORTED
# include "private/config/wel_supported.h"
Expand All @@ -38,5 +39,4 @@
# define config_open_default_target file_open_default_target
# define config_close_default_target stumpless_close_file_target
# endif

#endif /* __STUMPLESS_PRIVATE_CONFIG_WRAPPER_H */
#endif /* __STUMPLESS_PRIVATE_CONFIG_WRAPPER_OPEN_DEFAULT_TARGET_H */
2 changes: 1 addition & 1 deletion src/target.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "private/config.h"
#include "private/config/network_support_wrapper.h"
#include "private/config/locale/wrapper.h"
#include "private/config/wrapper.h"
#include "private/config/wrapper/open_default_target.h"
#include "private/config/wrapper/wel.h"
#include "private/config/wrapper/journald.h"
#include "private/config/wrapper/socket.h"
Expand Down
11 changes: 2 additions & 9 deletions tools/check_headers/stumpless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,25 @@
"CATEGORY_TREE": "docs/examples/wel/example_events.h"
"clear_error": "private/error.h"
"close_server_socket": "test/helper/server.hpp"
"config_close_default_target": "private/config/wrapper.h"
"config_close_default_target": "private/config/wrapper/open_default_target.h"
"config_close_network_target": "private/config/network_support_wrapper.h"
"config_close_tcp4_target": "private/config/network_support_wrapper.h"
"config_close_udp4_target": "private/config/network_support_wrapper.h"
"config_copy_wel_fields": "private/config/wrapper.h"
"config_destroy_insertion_params": "private/config/wrapper.h"
"config_fopen": "private/config/wrapper.h"
"config_gethostname": "private/config/wrapper.h"
"config_getpagesize": "private/config/wrapper/getpagesize.h"
"config_get_now": "private/config/wrapper/get_now.h"
"config_init_tcp4": "private/config/network_support_wrapper.h"
"config_init_udp4": "private/config/network_support_wrapper.h"
"config_network_free_all": "private/config/network_support_wrapper.h"
"config_network_target_is_open": "private/config/network_support_wrapper.h"
"config_open_default_target": "private/config/wrapper.h"
"config_open_default_target": "private/config/wrapper/open_default_target.h"
"config_open_network_target": "private/config/network_support_wrapper.h"
"config_open_tcp4_target": "private/config/network_support_wrapper.h"
"config_open_udp4_target": "private/config/network_support_wrapper.h"
"config_reopen_tcp4_target": "private/config/network_support_wrapper.h"
"config_reopen_udp4_target": "private/config/network_support_wrapper.h"
"config_send_entry_to_wel_target": "private/config/wrapper.h"
"config_sendto_network_target": "private/config/network_support_wrapper.h"
"config_sendto_tcp4_target": "private/config/network_support_wrapper.h"
"config_sendto_udp4_target": "private/config/network_support_wrapper.h"
"config_set_tcp4_port": "private/config/wrapper.h"
"config_set_udp4_port": "private/config/wrapper.h"
"config_socket_handle_t": "private/config/network_support_wrapper.h"
"config_tcp4_is_open": "private/config/network_support_wrapper.h"
"config_udp4_is_open": "private/config/network_support_wrapper.h"
Expand Down

0 comments on commit 7a8c928

Please sign in to comment.