From 9c06c9e1668630928d4402aeb708b17bf009b4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sat, 22 Oct 2022 13:29:58 +0200 Subject: [PATCH 1/2] Issue #800: Fix clang function declaration without a prototype errors --- include/qpid/dispatch/bitmask.h | 2 +- include/qpid/dispatch/delivery_state.h | 2 +- include/qpid/dispatch/error.h | 6 +++--- include/qpid/dispatch/http1_codec.h | 5 ++--- include/qpid/dispatch/io_module.h | 9 ++++++--- include/qpid/dispatch/log.h | 2 +- include/qpid/dispatch/message.h | 4 ++-- include/qpid/dispatch/protocol_adaptor.h | 5 ++--- include/qpid/dispatch/server.h | 3 +-- include/qpid/dispatch/timer.h | 2 +- src/adaptors/adaptor_buffer.c | 2 +- src/adaptors/adaptor_buffer.h | 2 +- src/adaptors/adaptor_listener.c | 6 ++---- src/adaptors/http1/http1_codec.c | 5 ++--- src/adaptors/http_common.c | 6 +++--- src/adaptors/tcp/tcp_adaptor.c | 4 ++-- src/bitmask.c | 3 +-- src/delivery_state.c | 2 +- src/dispatch.c | 8 ++++---- src/dispatch_private.h | 4 +--- src/entity_cache.c | 9 ++++++--- src/entity_cache.h | 4 ++-- src/error.c | 12 ++++++++---- src/http-libwebsockets.c | 3 ++- src/log.c | 11 +++++++++-- src/message.c | 13 ++++++++----- src/message_private.h | 2 +- src/parse_tree.c | 2 +- src/parse_tree.h | 2 +- src/policy.c | 7 +++---- src/policy.h | 4 ++-- src/posix/threading.c | 3 +-- src/router_core/delivery.h | 5 ++++- src/server.c | 5 ++--- src/server_private.h | 2 +- src/timer.c | 13 ++++++++----- src/timer_private.h | 4 ++-- tests/clogger.c | 3 +-- 38 files changed, 100 insertions(+), 86 deletions(-) diff --git a/include/qpid/dispatch/bitmask.h b/include/qpid/dispatch/bitmask.h index dd7d3dfd0..7b168082e 100644 --- a/include/qpid/dispatch/bitmask.h +++ b/include/qpid/dispatch/bitmask.h @@ -33,7 +33,7 @@ typedef struct qd_bitmask_t qd_bitmask_t; /** Number of bits in a bitmask. */ -int qd_bitmask_width(); +int qd_bitmask_width(void); /** Create a bitmask. *@param initial if non-zero set all bits, else clear all bits. diff --git a/include/qpid/dispatch/delivery_state.h b/include/qpid/dispatch/delivery_state.h index 8c0b7a7f5..36ac87868 100644 --- a/include/qpid/dispatch/delivery_state.h +++ b/include/qpid/dispatch/delivery_state.h @@ -54,7 +54,7 @@ typedef struct { } qd_delivery_state_t; // allocate -qd_delivery_state_t *qd_delivery_state(); +qd_delivery_state_t *qd_delivery_state(void); // this constructor takes ownership of err. err will be freed by // qd_delivery_state_free() diff --git a/include/qpid/dispatch/error.h b/include/qpid/dispatch/error.h index ff37bd78b..5b8718550 100644 --- a/include/qpid/dispatch/error.h +++ b/include/qpid/dispatch/error.h @@ -75,17 +75,17 @@ qd_error_t qd_error_vimpl(qd_error_t code, const char *file, int line, const cha * Clear thread-local error code and message. *@return QD_ERROR_NONE */ -qd_error_t qd_error_clear(); +qd_error_t qd_error_clear(void); /** * @return Thread local error message. Includes text for error code. */ -QD_EXPORT const char* qd_error_message(); +QD_EXPORT const char *qd_error_message(void); /** *@return Thread local error code */ -QD_EXPORT qd_error_t qd_error_code(); +QD_EXPORT qd_error_t qd_error_code(void); /** Maximum length of a qd_error_message, useful for temporary buffers. */ extern const int QD_ERROR_MAX; diff --git a/include/qpid/dispatch/http1_codec.h b/include/qpid/dispatch/http1_codec.h index a035a6fb8..db0101654 100644 --- a/include/qpid/dispatch/http1_codec.h +++ b/include/qpid/dispatch/http1_codec.h @@ -259,8 +259,7 @@ int h1_codec_tx_begin_multipart_section(h1_codec_request_state_t *hrs); // int h1_codec_tx_end_multipart(h1_codec_request_state_t *hrs); -uint64_t h1_codec_tx_multipart_section_boundary_length(); -uint64_t h1_codec_tx_multipart_end_boundary_length(); - +uint64_t h1_codec_tx_multipart_section_boundary_length(void); +uint64_t h1_codec_tx_multipart_end_boundary_length(void); #endif // http1_codec_H diff --git a/include/qpid/dispatch/io_module.h b/include/qpid/dispatch/io_module.h index 9490a7ba5..92213cb83 100644 --- a/include/qpid/dispatch/io_module.h +++ b/include/qpid/dispatch/io_module.h @@ -52,9 +52,12 @@ typedef void (*qdr_adaptor_final_t) (void *adaptor_context); * @param on_init Pointer to a function for adaptor initialization, called at core thread startup * @param on_final Pointer to a function for adaptor finalization, called at core thread shutdown */ -#define QDR_CORE_ADAPTOR_DECLARE_ORD(name,on_init,on_final,ord) \ - static void adaptorstart() __attribute__((constructor)); \ - void adaptorstart() { qdr_register_adaptor(name, on_init, on_final, ord); } +#define QDR_CORE_ADAPTOR_DECLARE_ORD(name, on_init, on_final, ord) \ + static void adaptorstart(void) __attribute__((constructor)); \ + void adaptorstart(void) \ + { \ + qdr_register_adaptor(name, on_init, on_final, ord); \ + } #define QDR_CORE_ADAPTOR_DECLARE(name,on_init,on_final) QDR_CORE_ADAPTOR_DECLARE_ORD(name,on_init,on_final,100) void qdr_register_adaptor(const char *name, qdr_adaptor_init_t on_init, diff --git a/include/qpid/dispatch/log.h b/include/qpid/dispatch/log.h index 62650292a..8d52dcf00 100644 --- a/include/qpid/dispatch/log.h +++ b/include/qpid/dispatch/log.h @@ -78,7 +78,7 @@ void qd_vlog_impl(qd_log_source_t *source, qd_log_level_t level, bool check_leve } while(0) /** Maximum length for a log message */ -int qd_log_max_len(); +int qd_log_max_len(void); void qd_format_string(char* buf, int buf_size, const char *fmt, ...); diff --git a/include/qpid/dispatch/message.h b/include/qpid/dispatch/message.h index 49e1a8708..80f747629 100644 --- a/include/qpid/dispatch/message.h +++ b/include/qpid/dispatch/message.h @@ -435,9 +435,9 @@ int qd_message_stream_data_append(qd_message_t *msg, qd_buffer_list_t *data, boo */ char* qd_message_repr(qd_message_t *msg, char* buffer, size_t len, qd_log_bits log_message); /** Recommended buffer length for qd_message_repr */ -int qd_message_repr_len(); +int qd_message_repr_len(void); -qd_log_source_t* qd_message_log_source(); +qd_log_source_t *qd_message_log_source(void); /** * Accessor for incoming messages ingress router annotation diff --git a/include/qpid/dispatch/protocol_adaptor.h b/include/qpid/dispatch/protocol_adaptor.h index 360799cd6..58ffffa9c 100644 --- a/include/qpid/dispatch/protocol_adaptor.h +++ b/include/qpid/dispatch/protocol_adaptor.h @@ -873,9 +873,8 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted, void qdr_connection_info_set_group_correlator(qdr_connection_info_t *info, const char *correlator); -void qd_adaptor_listener_init(); -void qd_adaptor_listener_finalize(); - +void qd_adaptor_listener_init(void); +void qd_adaptor_listener_finalize(void); /** ****************************************************************************** diff --git a/include/qpid/dispatch/server.h b/include/qpid/dispatch/server.h index 347e79953..4f17bd6cd 100644 --- a/include/qpid/dispatch/server.h +++ b/include/qpid/dispatch/server.h @@ -561,8 +561,7 @@ void qd_connection_invoke_deferred_impl(qd_connection_t *conn, qd_deferred_t cal /** * Allocate a qd_deferred_call_t object */ -void *qd_connection_new_qd_deferred_call_t(); - +void *qd_connection_new_qd_deferred_call_t(void); /** * Deallocate a qd_deferred_call_t object diff --git a/include/qpid/dispatch/timer.h b/include/qpid/dispatch/timer.h index 1d84d94b4..a3089bb95 100644 --- a/include/qpid/dispatch/timer.h +++ b/include/qpid/dispatch/timer.h @@ -115,7 +115,7 @@ void qd_timer_cancel(qd_timer_t *timer); /** * The current time. */ -qd_timestamp_t qd_timer_now() ; +qd_timestamp_t qd_timer_now(void); /** * @} diff --git a/src/adaptors/adaptor_buffer.c b/src/adaptors/adaptor_buffer.c index 8a54ee931..3a7131da5 100644 --- a/src/adaptors/adaptor_buffer.c +++ b/src/adaptors/adaptor_buffer.c @@ -27,7 +27,7 @@ const size_t QD_ADAPTOR_MAX_BUFFER_SIZE = 16384; ALLOC_DEFINE_CONFIG(qd_adaptor_buffer_t, sizeof(qd_adaptor_buffer_t), &QD_ADAPTOR_MAX_BUFFER_SIZE, 0); -qd_adaptor_buffer_t *qd_adaptor_buffer() +qd_adaptor_buffer_t *qd_adaptor_buffer(void) { qd_adaptor_buffer_t *adaptor_buff = new_qd_adaptor_buffer_t(); DEQ_ITEM_INIT(adaptor_buff); diff --git a/src/adaptors/adaptor_buffer.h b/src/adaptors/adaptor_buffer.h index 500bb3d6f..51b9e86e6 100644 --- a/src/adaptors/adaptor_buffer.h +++ b/src/adaptors/adaptor_buffer.h @@ -35,7 +35,7 @@ struct qd_adaptor_buffer_t { }; qd_adaptor_buffer_t *qd_adaptor_buffer_raw(pn_raw_buffer_t *buffer); -qd_adaptor_buffer_t *qd_adaptor_buffer(); +qd_adaptor_buffer_t *qd_adaptor_buffer(void); ALLOC_DECLARE(qd_adaptor_buffer_t); DEQ_DECLARE(qd_adaptor_buffer_t, qd_adaptor_buffer_list_t); diff --git a/src/adaptors/adaptor_listener.c b/src/adaptors/adaptor_listener.c index 0c36ccd3c..0b9caf119 100644 --- a/src/adaptors/adaptor_listener.c +++ b/src/adaptors/adaptor_listener.c @@ -398,16 +398,14 @@ qd_listener_oper_status_t qd_adaptor_listener_oper_status(const qd_adaptor_liste return value; } - -void qd_adaptor_listener_init() +void qd_adaptor_listener_init(void) { sys_mutex_init(&_listeners_lock); DEQ_INIT(_listeners); _finalized = false; } - -void qd_adaptor_listener_finalize() +void qd_adaptor_listener_finalize(void) { _finalized = true; qd_adaptor_listener_t *li = DEQ_HEAD(_listeners); diff --git a/src/adaptors/http1/http1_codec.c b/src/adaptors/http1/http1_codec.c index dcc3abefb..b68752265 100644 --- a/src/adaptors/http1/http1_codec.c +++ b/src/adaptors/http1/http1_codec.c @@ -1598,13 +1598,12 @@ int h1_codec_tx_end_multipart(h1_codec_request_state_t *hrs) return 0; } - -uint64_t h1_codec_tx_multipart_section_boundary_length() +uint64_t h1_codec_tx_multipart_section_boundary_length(void) { return QD_DISCRIMINATOR_SIZE + 4 + 2; } -uint64_t h1_codec_tx_multipart_end_boundary_length() +uint64_t h1_codec_tx_multipart_end_boundary_length(void) { return QD_DISCRIMINATOR_SIZE + 4 + 4; } diff --git a/src/adaptors/http_common.c b/src/adaptors/http_common.c index 548ee9214..68a6be8c6 100644 --- a/src/adaptors/http_common.c +++ b/src/adaptors/http_common.c @@ -39,7 +39,7 @@ ALLOC_DEFINE(qd_http_adaptor_config_t); #define CHECK() if (qd_error_code()) goto error -static qd_http_adaptor_config_t *qd_http_adaptor_config() +static qd_http_adaptor_config_t *qd_http_adaptor_config(void) { qd_http_adaptor_config_t *http_config = new_qd_http_adaptor_config_t(); assert(http_config); @@ -367,7 +367,7 @@ typedef struct { static http_request_info_records_t* request_info = 0; -static http_request_info_records_t *_get_request_info() +static http_request_info_records_t *_get_request_info(void) { if (!request_info) { request_info = NEW(http_request_info_records_t); @@ -677,7 +677,7 @@ static void _add_http_request_info(qdr_core_t *core, qdr_http_request_info_t* re qdr_action_enqueue(core, action); } -static qdr_http_request_info_t* _new_qdr_http_request_info_t() +static qdr_http_request_info_t *_new_qdr_http_request_info_t(void) { qdr_http_request_info_t* record = NEW(qdr_http_request_info_t); ZERO(record); diff --git a/src/adaptors/tcp/tcp_adaptor.c b/src/adaptors/tcp/tcp_adaptor.c index 941982af5..d14788280 100644 --- a/src/adaptors/tcp/tcp_adaptor.c +++ b/src/adaptors/tcp/tcp_adaptor.c @@ -837,7 +837,7 @@ static char *get_global_id(char *site_id, char *host_port) return result; } -static pn_data_t * qdr_tcp_conn_properties() +static pn_data_t *qdr_tcp_conn_properties(void) { // Return a new tcp connection properties map. pn_data_t *props = pn_data(0); @@ -1432,7 +1432,7 @@ static qdr_tcp_connection_t *qdr_tcp_create_dispatcher_connection(qd_tcp_connect return tc; } -static qd_tcp_adaptor_config_t *qd_tcp_adaptor_config() +static qd_tcp_adaptor_config_t *qd_tcp_adaptor_config(void) { qd_tcp_adaptor_config_t *tcp_config = new_qd_tcp_adaptor_config_t(); if (!tcp_config) diff --git a/src/bitmask.c b/src/bitmask.c index 12774cc93..84c1d9e90 100644 --- a/src/bitmask.c +++ b/src/bitmask.c @@ -41,8 +41,7 @@ ALLOC_DEFINE(qd_bitmask_t); #define FIRST_NONE -1 #define FIRST_UNKNOWN -2 - -int qd_bitmask_width() +int qd_bitmask_width(void) { return QD_BITMASK_BITS; } diff --git a/src/delivery_state.c b/src/delivery_state.c index 6b7e3d738..6504b3779 100644 --- a/src/delivery_state.c +++ b/src/delivery_state.c @@ -24,7 +24,7 @@ ALLOC_DECLARE(qd_delivery_state_t); ALLOC_DEFINE(qd_delivery_state_t); -qd_delivery_state_t *qd_delivery_state() +qd_delivery_state_t *qd_delivery_state(void) { qd_delivery_state_t *dstate = new_qd_delivery_state_t(); ZERO(dstate); diff --git a/src/dispatch.c b/src/dispatch.c index 01fc048bb..ef085ac52 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -55,7 +55,7 @@ void qd_policy_free(qd_policy_t *policy); qd_router_t *qd_router(qd_dispatch_t *qd, qd_router_mode_t mode, const char *area, const char *id); void qd_router_setup_late(qd_dispatch_t *qd); void qd_router_free(qd_router_t *router); -void qd_error_initialize(); +void qd_error_initialize(void); static void qd_dispatch_set_router_id(qd_dispatch_t *qd, char *_id); static void qd_dispatch_set_router_area(qd_dispatch_t *qd, char *_area); static void qd_dispatch_policy_c_counts_free(PyObject *capsule); @@ -69,7 +69,7 @@ sys_atomic_t global_delivery_id; qd_dispatch_t *qd = 0; -qd_dispatch_t *qd_dispatch_get_dispatch() +qd_dispatch_t *qd_dispatch_get_dispatch(void) { return qd; } @@ -265,7 +265,7 @@ QD_EXPORT qd_error_t qd_dispatch_register_display_name_service(qd_dispatch_t *qd return qd_register_display_name_service(qd, object); } -QD_EXPORT PyObject* qd_dispatch_policy_c_counts_alloc() +QD_EXPORT PyObject *qd_dispatch_policy_c_counts_alloc(void) { return PyCapsule_New(qd_policy_c_counts_alloc(), "qd_policy_c_counts", qd_dispatch_policy_c_counts_free); } @@ -389,7 +389,7 @@ qdr_core_t* qd_dispatch_router_core(const qd_dispatch_t *qd) * * Return 0 if the memory usage cannot be determined. */ -uint64_t qd_router_memory_usage() +uint64_t qd_router_memory_usage(void) { // @TODO(kgiusti): only works for linux (what? doesn't everyone run linux?) diff --git a/src/dispatch_private.h b/src/dispatch_private.h index e7e0d8ad4..921ec1e75 100644 --- a/src/dispatch_private.h +++ b/src/dispatch_private.h @@ -62,9 +62,7 @@ struct qd_dispatch_t { char *metadata; }; -qd_dispatch_t *qd_dispatch_get_dispatch(); - - +qd_dispatch_t *qd_dispatch_get_dispatch(void); /** * Configure the router node from a configuration entity. diff --git a/src/entity_cache.c b/src/entity_cache.c index e8bc18828..31eb9a475 100644 --- a/src/entity_cache.c +++ b/src/entity_cache.c @@ -51,12 +51,14 @@ static entity_event_t *entity_event(action_t action, const char *type, void *obj static sys_mutex_t event_lock; static entity_event_list_t event_list; -void qd_entity_cache_initialize() { +void qd_entity_cache_initialize(void) +{ sys_mutex_init(&event_lock); DEQ_INIT(event_list); } -void qd_entity_cache_free_entries() { +void qd_entity_cache_free_entries(void) +{ sys_mutex_lock(&event_lock); entity_event_t *event = DEQ_HEAD(event_list); while (event) { @@ -99,6 +101,7 @@ QD_EXPORT qd_error_t qd_entity_refresh_begin(PyObject *list) { return qd_error_code(); } -QD_EXPORT void qd_entity_refresh_end() { +QD_EXPORT void qd_entity_refresh_end(void) +{ sys_mutex_unlock(&event_lock); } diff --git a/src/entity_cache.h b/src/entity_cache.h index 732e270d6..966790fd4 100644 --- a/src/entity_cache.h +++ b/src/entity_cache.h @@ -32,10 +32,10 @@ */ /** Initialize the module. */ -void qd_entity_cache_initialize(); +void qd_entity_cache_initialize(void); /** Free all entries in the cache. Avoids leaks in c_unittests. */ -void qd_entity_cache_free_entries(); +void qd_entity_cache_free_entries(void); /** Add an entity to the agent cache. */ void qd_entity_cache_add(const char *type, void *object); diff --git a/src/error.c b/src/error.c index 2c5e41c1c..406f5fddc 100644 --- a/src/error.c +++ b/src/error.c @@ -66,7 +66,8 @@ static __thread struct { static qd_log_source_t* log_source = 0; -void qd_error_initialize() { +void qd_error_initialize(void) +{ log_source = qd_log_source("ERROR"); } @@ -99,17 +100,20 @@ qd_error_t qd_error_impl(qd_error_t code, const char *file, int line, const char return err; } -qd_error_t qd_error_clear() { +qd_error_t qd_error_clear(void) +{ ts.error_code = 0; snprintf(ts.error_message, ERROR_MAX, "No Error"); return QD_ERROR_NONE; } -const char* qd_error_message() { +const char *qd_error_message(void) +{ return ts.error_message; } -qd_error_t qd_error_code() { +qd_error_t qd_error_code(void) +{ return ts.error_code; } diff --git a/src/http-libwebsockets.c b/src/http-libwebsockets.c index fcec89033..c331b664c 100644 --- a/src/http-libwebsockets.c +++ b/src/http-libwebsockets.c @@ -59,7 +59,8 @@ static void logger(int lll, const char *line) { qd_log(http_log, qd_level(lll), "%.*s", (int)len, line); } -static void log_init() { +static void log_init(void) +{ http_log = qd_log_source("HTTP"); int levels = 0; for (int i = 0; i < LLL_COUNT; ++i) { diff --git a/src/log.c b/src/log.c index af9d730d3..ebd58f34d 100644 --- a/src/log.c +++ b/src/log.c @@ -46,7 +46,10 @@ const char *QD_LOG_STATS_TYPE = "logStats"; static qd_log_source_t *default_log_source=0; -int qd_log_max_len() { return TEXT_MAX; } +int qd_log_max_len(void) +{ + return TEXT_MAX; +} typedef struct qd_log_entry_t qd_log_entry_t; @@ -464,7 +467,11 @@ void qd_log_impl(qd_log_source_t *source, qd_log_level_t level, const char *file va_end(ap); } -static PyObject *inc_none() { Py_INCREF(Py_None); return Py_None; } +static PyObject *inc_none(void) +{ + Py_INCREF(Py_None); + return Py_None; +} /// Return the log buffer up to limit as a python list. Called by management agent. QD_EXPORT PyObject *qd_log_recent_py(long limit) { diff --git a/src/message.c b/src/message.c index 8cc18499c..3e80cfc7b 100644 --- a/src/message.c +++ b/src/message.c @@ -99,7 +99,7 @@ typedef void (*buffer_process_t) (void *context, const unsigned char *base, int qd_log_source_t* log_source = 0; -qd_log_source_t* qd_message_log_source() +qd_log_source_t *qd_message_log_source(void) { if(log_source) return log_source; @@ -109,11 +109,15 @@ qd_log_source_t* qd_message_log_source() } } -void qd_message_initialize() { +void qd_message_initialize(void) +{ log_source = qd_log_source("MESSAGE"); } -int qd_message_repr_len() { return qd_log_max_len(); } +int qd_message_repr_len(void) +{ + return qd_log_max_len(); +} /** * Quote non-printable characters suitable for log messages. Output in buffer. @@ -1031,8 +1035,7 @@ static qd_field_location_t *qd_message_field_location(qd_message_t *msg, qd_mess return 0; } - -qd_message_t *qd_message() +qd_message_t *qd_message(void) { qd_message_pvt_t *msg = (qd_message_pvt_t*) new_qd_message_t(); if (!msg) diff --git a/src/message_private.h b/src/message_private.h index 11391a8df..0d3a830e2 100644 --- a/src/message_private.h +++ b/src/message_private.h @@ -178,7 +178,7 @@ ALLOC_DECLARE(qd_message_content_t); #define MSG_FLAG_STREAMING 0x01u /** Initialize logging */ -void qd_message_initialize(); +void qd_message_initialize(void); // // Internal API - exported for unit testing ONLY: diff --git a/src/parse_tree.c b/src/parse_tree.c index c79342e8f..9942fe1aa 100644 --- a/src/parse_tree.c +++ b/src/parse_tree.c @@ -99,7 +99,7 @@ static void token_iterator_next(token_iterator_t *t) const char address_token_sep[] = "./"; -const char *qd_parse_address_token_sep() +const char *qd_parse_address_token_sep(void) { return address_token_sep; } diff --git a/src/parse_tree.h b/src/parse_tree.h index fd283c739..3e985946d 100644 --- a/src/parse_tree.h +++ b/src/parse_tree.h @@ -50,7 +50,7 @@ typedef enum { qd_parse_tree_t *qd_parse_tree_new(qd_parse_tree_type_t type); void qd_parse_tree_free(qd_parse_tree_t *tree); qd_parse_tree_type_t qd_parse_tree_type(const qd_parse_tree_t *tree); -const char *qd_parse_address_token_sep(); +const char *qd_parse_address_token_sep(void); // verify the pattern is in a legal format for the given tree's match algorithm bool qd_parse_tree_validate_pattern(const qd_parse_tree_t *tree, diff --git a/src/policy.c b/src/policy.c index 4a0b48afc..f87ec39bd 100644 --- a/src/policy.c +++ b/src/policy.c @@ -188,8 +188,7 @@ qd_error_t qd_register_policy_manager(qd_policy_t *policy, void *policy_manager) return QD_ERROR_NONE; } - -void *qd_policy_c_counts_alloc() +void *qd_policy_c_counts_alloc(void) { qd_policy_denial_counts_t *dc = NEW(qd_policy_denial_counts_t); assert(dc); @@ -1465,7 +1464,7 @@ char * qd_policy_compile_allowed_csv(char * csv) return result; } - -qd_log_source_t* qd_policy_log_source() { +qd_log_source_t *qd_policy_log_source(void) +{ return policy_log_source; } diff --git a/src/policy.h b/src/policy.h index d326c0c28..2e1e1c0bd 100644 --- a/src/policy.h +++ b/src/policy.h @@ -85,7 +85,7 @@ qd_error_t qd_register_policy_manager(qd_policy_t *policy, void *policy_manager) /** Allocate counts statistics block. * Called from Python */ -void* qd_policy_c_counts_alloc(); +void *qd_policy_c_counts_alloc(void); /** Free counts statistics block. * Called from Python @@ -261,5 +261,5 @@ void qd_policy_count_max_size_event(pn_link_t *link, qd_connection_t *qd_conn); /** * Return POLICY log_source to log policy */ -qd_log_source_t* qd_policy_log_source(); +qd_log_source_t *qd_policy_log_source(void); #endif diff --git a/src/posix/threading.c b/src/posix/threading.c index 52dfd5b34..a3efee5d0 100644 --- a/src/posix/threading.c +++ b/src/posix/threading.c @@ -168,8 +168,7 @@ sys_thread_t *sys_thread(const char *thread_name, void *(*run_function) (void *) return thread; } - -sys_thread_t *sys_thread_self() +sys_thread_t *sys_thread_self(void) { return _self; } diff --git a/src/router_core/delivery.h b/src/router_core/delivery.h index 6773e1b6e..3addab506 100644 --- a/src/router_core/delivery.h +++ b/src/router_core/delivery.h @@ -74,7 +74,10 @@ ALLOC_DECLARE(qdr_delivery_t); /** Delivery Id for logging - thread safe */ extern sys_atomic_t global_delivery_id; -static inline uint32_t next_delivery_id() { return sys_atomic_inc(&global_delivery_id); } +static inline uint32_t next_delivery_id(void) +{ + return sys_atomic_inc(&global_delivery_id); +} // Common log line prefix #define DLV_FMT "[C%"PRIu64"][L%"PRIu64"][D%"PRIu32"]" diff --git a/src/server.c b/src/server.c index e18111ade..42e74a6ab 100644 --- a/src/server.c +++ b/src/server.c @@ -1428,7 +1428,7 @@ void qd_server_set_container(qd_dispatch_t *qd, qd_container_t *container) qd->server->container = container; } -void qd_server_trace_all_connections() +void qd_server_trace_all_connections(void) { qd_dispatch_t *qd = qd_dispatch_get_dispatch(); if (qd->server) { @@ -1612,8 +1612,7 @@ void qd_connection_invoke_deferred_impl(qd_connection_t *conn, qd_deferred_t cal sys_mutex_unlock(&conn->server->conn_activation_lock); } - -void *qd_connection_new_qd_deferred_call_t() +void *qd_connection_new_qd_deferred_call_t(void) { return new_qd_deferred_call_t(); } diff --git a/src/server_private.h b/src/server_private.h index c3ce63786..e0105778b 100644 --- a/src/server_private.h +++ b/src/server_private.h @@ -208,7 +208,7 @@ ALLOC_DECLARE(qd_pn_free_link_session_t); /** * For every connection on the server's connection list, call pn_transport_set_tracer and enable trace logging */ -void qd_server_trace_all_connections(); +void qd_server_trace_all_connections(void); /** * This function is set as the pn_transport->tracer and is invoked when proton tries to write the log message to pn_transport->tracer diff --git a/src/timer.c b/src/timer.c index 34053b23d..10a8fa65b 100644 --- a/src/timer.c +++ b/src/timer.c @@ -88,7 +88,10 @@ ALLOC_DECLARE(qd_timer_t); ALLOC_DEFINE(qd_timer_t); /// For tests only -sys_mutex_t* qd_timer_lock() { return &lock; } +sys_mutex_t *qd_timer_lock(void) +{ + return &lock; +} //========================================================================= // Private static functions @@ -199,9 +202,9 @@ void qd_timer_free(qd_timer_t *timer) sys_mutex_unlock(&lock); } - -__attribute__((weak)) // permit replacement by dummy implementation in unit_tests -qd_timestamp_t qd_timer_now() +__attribute__((weak)) // permit replacement by dummy implementation in unit_tests +qd_timestamp_t +qd_timer_now(void) { return pn_proactor_now_64(); } @@ -295,7 +298,7 @@ void qd_timer_finalize(void) /* Execute all timers that are ready and set up next timeout. */ -void qd_timer_visit() +void qd_timer_visit(void) { sys_mutex_lock(&lock); callback_thread = sys_thread_self(); diff --git a/src/timer_private.h b/src/timer_private.h index 12c19bcec..7f7576809 100644 --- a/src/timer_private.h +++ b/src/timer_private.h @@ -24,9 +24,9 @@ void qd_timer_initialize(void); void qd_timer_finalize(void); -void qd_timer_visit(); +void qd_timer_visit(void); /// For tests only -sys_mutex_t* qd_timer_lock(); +sys_mutex_t* qd_timer_lock(void); #endif diff --git a/tests/clogger.c b/tests/clogger.c index bfb71c86e..41ee2b188 100644 --- a/tests/clogger.c +++ b/tests/clogger.c @@ -118,8 +118,7 @@ static void signal_handler(int signum) pn_proactor_interrupt(proactor); } - -void start_message() +void start_message(void) { static long tag = 0; // a simple tag generator From d995a73dd9774ab16c4e7badc5f2708456d346f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Sat, 22 Oct 2022 14:53:10 +0200 Subject: [PATCH 2/2] fixup more voids --- include/qpid/dispatch/internal/symbolization.h | 2 +- src/posix/symbolization.c | 4 ++-- src/router_core/module.h | 9 ++++++--- src/timer.c | 5 ++--- tests/buffer_test.c | 3 +-- tests/clogger.c | 2 +- tests/compose_test.c | 3 +-- tests/failoverlist_test.c | 3 +-- tests/parse_test.c | 3 +-- tests/run_unit_tests_size.c | 12 +++++------- tests/thread_test.c | 3 +-- tests/threaded_timer_test.c | 4 ++-- tests/timer_test.c | 6 +++--- 13 files changed, 27 insertions(+), 32 deletions(-) diff --git a/include/qpid/dispatch/internal/symbolization.h b/include/qpid/dispatch/internal/symbolization.h index 4b859135c..67f77764e 100644 --- a/include/qpid/dispatch/internal/symbolization.h +++ b/include/qpid/dispatch/internal/symbolization.h @@ -34,7 +34,7 @@ typedef struct qd_backtrace_fileline { /// Call qd_symbolize_finalize when you are done, to free global state. /// This also invalidates all const char pointers previously returned. -void qd_symbolize_finalize(); +void qd_symbolize_finalize(void); void qd_print_symbolized_backtrace_line(FILE *dump_file, const char *fallback_symbolization, int i, void *pc); qd_backtrace_fileline_t qd_symbolize_backtrace_line(void *target_address); diff --git a/src/posix/symbolization.c b/src/posix/symbolization.c index 4b4e41828..f02a0c4e0 100644 --- a/src/posix/symbolization.c +++ b/src/posix/symbolization.c @@ -34,7 +34,7 @@ static struct { Dwfl_Callbacks dwfl_callbacks; ///< struct holding libdfl callbacks } state = {0}; -bool ensure_libdwfl_intialized() +bool ensure_libdwfl_intialized(void) { if (!state.libdwlf_inited) { state.dwfl_callbacks.find_elf = &dwfl_linux_proc_find_elf; @@ -127,7 +127,7 @@ void qd_print_symbolized_backtrace_line(FILE *dump_file, const char *fallback_sy fprintf(dump_file, " %s\n", fallback_symbolization); } -void qd_symbolize_finalize() +void qd_symbolize_finalize(void) { if (state.libdwlf_inited) { dwfl_end(state.dwfl); diff --git a/src/router_core/module.h b/src/router_core/module.h index 30168df0c..a5de60c5c 100644 --- a/src/router_core/module.h +++ b/src/router_core/module.h @@ -60,9 +60,12 @@ typedef void (*qdrc_module_final_t) (void *module_context); * @param on_init Pointer to a function for module initialization, called at core thread startup * @param on_final Pointer to a function for module finalization, called at core thread shutdown */ -#define QDR_CORE_MODULE_DECLARE(name,enable,on_init,on_final) \ - static void modstart() __attribute__((constructor)); \ - void modstart() { qdr_register_core_module(name, enable, on_init, on_final); } +#define QDR_CORE_MODULE_DECLARE(name, enable, on_init, on_final) \ + static void modstart(void) __attribute__((constructor)); \ + void modstart(void) \ + { \ + qdr_register_core_module(name, enable, on_init, on_final); \ + } void qdr_register_core_module(const char *name, qdrc_module_enable_t enable, qdrc_module_init_t on_init, diff --git a/src/timer.c b/src/timer.c index 10a8fa65b..acb05ec9e 100644 --- a/src/timer.c +++ b/src/timer.c @@ -112,7 +112,7 @@ static bool timer_cancel_LH(qd_timer_t *timer) /* Adjust timer's time_base and delays for the current time. */ -static void timer_adjust_now_LH() +static void timer_adjust_now_LH(void) { qd_timestamp_t now = qd_timer_now(); if (time_base != 0 && now > time_base) { @@ -282,8 +282,7 @@ void qd_timer_cancel(qd_timer_t *timer) // Private Functions from timer_private.h //========================================================================= - -void qd_timer_initialize() +void qd_timer_initialize(void) { sys_mutex_init(&lock); DEQ_INIT(scheduled_timers); diff --git a/tests/buffer_test.c b/tests/buffer_test.c index e569f8397..3d00719e3 100644 --- a/tests/buffer_test.c +++ b/tests/buffer_test.c @@ -424,8 +424,7 @@ static char *test_buffer_field_iterator(void *context) return result; } - -int buffer_tests() +int buffer_tests(void) { int result = 0; char *test_group = "buffer_tests"; diff --git a/tests/clogger.c b/tests/clogger.c index 41ee2b188..bb0837dfb 100644 --- a/tests/clogger.c +++ b/tests/clogger.c @@ -153,7 +153,7 @@ void start_message(void) /* return true when message transmit is complete */ -bool send_message_data() +bool send_message_data(void) { static const char zero_block[DEFAULT_MAX_FRAME] = {0}; diff --git a/tests/compose_test.c b/tests/compose_test.c index f78ba2ad2..2ee6d56ad 100644 --- a/tests/compose_test.c +++ b/tests/compose_test.c @@ -500,8 +500,7 @@ static char *test_compose_buffer_field(void *context) return error; } - -int compose_tests() +int compose_tests(void) { int result = 0; char *test_group = "compose_tests"; diff --git a/tests/failoverlist_test.c b/tests/failoverlist_test.c index c56a8623c..bf0647b71 100644 --- a/tests/failoverlist_test.c +++ b/tests/failoverlist_test.c @@ -151,8 +151,7 @@ static char *test_failover_list_multiple(void *unused) return fail; } - -int failoverlist_tests() +int failoverlist_tests(void) { int result = 0; char *test_group = "failover_tests"; diff --git a/tests/parse_test.c b/tests/parse_test.c index 43a0b4059..cdc389b12 100644 --- a/tests/parse_test.c +++ b/tests/parse_test.c @@ -717,8 +717,7 @@ static char *test_field_api(void *context) return result; } - -int parse_tests() +int parse_tests(void) { int result = 0; char *test_group = "parse_tests"; diff --git a/tests/run_unit_tests_size.c b/tests/run_unit_tests_size.c index 665cf77fe..500b359b2 100644 --- a/tests/run_unit_tests_size.c +++ b/tests/run_unit_tests_size.c @@ -26,16 +26,14 @@ extern void qd_buffer_set_size_test_only(size_t size); void qd_log_initialize(void); void qd_log_finalize(void); -void qd_error_initialize(); +void qd_error_initialize(void); void qd_router_id_initialize(const char *, const char *); void qd_router_id_finalize(void); - -int message_tests(); -int field_tests(); -int parse_tests(); -int buffer_tests(); - +int message_tests(void); +int field_tests(void); +int parse_tests(void); +int buffer_tests(void); // validate router id constructor // diff --git a/tests/thread_test.c b/tests/thread_test.c index fc2499fff..3aa3ef139 100644 --- a/tests/thread_test.c +++ b/tests/thread_test.c @@ -172,8 +172,7 @@ static char *test_condition(void *context) return result; } - -int thread_tests() +int thread_tests(void) { int result = 0; char *test_group = "thread_tests"; diff --git a/tests/threaded_timer_test.c b/tests/threaded_timer_test.c index bc47d9c99..870f92dd6 100644 --- a/tests/threaded_timer_test.c +++ b/tests/threaded_timer_test.c @@ -73,13 +73,13 @@ static struct event_t { sys_cond_t c; } event; -static void test_setup() +static void test_setup(void) { sys_mutex_init(&event.m); sys_cond_init(&event.c); } -static void test_cleanup() +static void test_cleanup(void) { sys_mutex_free(&event.m); sys_cond_free(&event.c); diff --git a/tests/timer_test.c b/tests/timer_test.c index fa7baaf6d..061509b4c 100644 --- a/tests/timer_test.c +++ b/tests/timer_test.c @@ -33,7 +33,8 @@ static qd_timer_t *timers[16]; /* Dummy out the now and timeout functions */ -qd_timestamp_t qd_timer_now() { +qd_timestamp_t qd_timer_now(void) +{ return time_value; } @@ -282,8 +283,7 @@ static char* test_big(void *context) return 0; } - -int timer_tests() +int timer_tests(void) { char *test_group = "timer_tests"; int result = 0;