Skip to content

Commit

Permalink
DISPATCH-2368: chore(build): add a missing (void) into C function d…
Browse files Browse the repository at this point in the history
…eclarations (#1705)

This is an intermediate step (in C23 this can be handled differently), but for now it's the most reasonable fix.

Fixes compilation failures such as this one

```
error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
```
  • Loading branch information
jiridanek authored Jan 13, 2025
1 parent 52c0522 commit fd94849
Show file tree
Hide file tree
Showing 38 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion include/qpid/dispatch/bitmask.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion include/qpid/dispatch/delivery_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions include/qpid/dispatch/error.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,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;
Expand Down
2 changes: 1 addition & 1 deletion include/qpid/dispatch/log.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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, ...) __attribute__((format(printf, 3, 4)));

Expand Down
4 changes: 2 additions & 2 deletions include/qpid/dispatch/message.h
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,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
Expand Down
2 changes: 1 addition & 1 deletion include/qpid/dispatch/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,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);


/**
Expand Down
2 changes: 1 addition & 1 deletion include/qpid/dispatch/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;

/**
* @}
Expand Down
2 changes: 1 addition & 1 deletion src/bitmask.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ALLOC_DEFINE(qd_bitmask_t);
#define FIRST_UNKNOWN -2


int qd_bitmask_width()
int qd_bitmask_width(void)
{
return QD_BITMASK_BITS;
}
Expand Down
2 changes: 1 addition & 1 deletion src/delivery_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/dispatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -68,7 +68,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;
}
Expand Down Expand Up @@ -287,7 +287,7 @@ qd_error_t qd_dispatch_register_display_name_service(qd_dispatch_t *qd, void *ob
}


QD_EXPORT long qd_dispatch_policy_c_counts_alloc()
QD_EXPORT long qd_dispatch_policy_c_counts_alloc(void)
{
return qd_policy_c_counts_alloc();
}
Expand Down Expand Up @@ -404,7 +404,7 @@ qdr_core_t* qd_dispatch_router_core(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?)

Expand Down
2 changes: 1 addition & 1 deletion src/dispatch_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct qd_dispatch_t {
char *metadata;
};

qd_dispatch_t *qd_dispatch_get_dispatch();
qd_dispatch_t *qd_dispatch_get_dispatch(void);



Expand Down
6 changes: 3 additions & 3 deletions src/entity_cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ static entity_event_t *entity_event(action_t action, const char *type, void *obj
static sys_mutex_t *event_lock = 0;
static entity_event_list_t event_list;

void qd_entity_cache_initialize() {
void qd_entity_cache_initialize(void) {
event_lock = sys_mutex();
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) {
Expand Down Expand Up @@ -101,6 +101,6 @@ 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);
}
4 changes: 2 additions & 2 deletions src/entity_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ 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");
}

Expand Down Expand Up @@ -99,17 +99,17 @@ 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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/http-libwebsockets.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ 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) {
Expand Down
4 changes: 2 additions & 2 deletions src/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ 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;

Expand Down Expand Up @@ -464,7 +464,7 @@ 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) {
Expand Down
8 changes: 4 additions & 4 deletions src/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,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;
Expand All @@ -107,11 +107,11 @@ 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.
Expand Down Expand Up @@ -1008,7 +1008,7 @@ static qd_field_location_t *qd_message_field_location(qd_message_t *msg, qd_mess
}


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)
Expand Down
2 changes: 1 addition & 1 deletion src/message_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ ALLOC_DECLARE(qd_message_content_t);
#define MSG_CONTENT(m) (((qd_message_pvt_t*) m)->content)

/** Initialize logging */
void qd_message_initialize();
void qd_message_initialize(void);

// These expect content->lock to be locked.
bool _Q2_holdoff_should_block_LH(const qd_message_content_t *content);
Expand Down
2 changes: 1 addition & 1 deletion src/parse_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/parse_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ qd_error_t qd_register_policy_manager(qd_policy_t *policy, void *policy_manager)
}


long qd_policy_c_counts_alloc()
long qd_policy_c_counts_alloc(void)
{
qd_policy_denial_counts_t * dc = NEW(qd_policy_denial_counts_t);
assert(dc);
Expand Down Expand Up @@ -1561,6 +1561,6 @@ char * qd_policy_compile_allowed_csv(char * csv)
}


qd_log_source_t* qd_policy_log_source() {
qd_log_source_t* qd_policy_log_source(void) {
return policy_log_source;
}
4 changes: 2 additions & 2 deletions src/policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
long qd_policy_c_counts_alloc();
long qd_policy_c_counts_alloc(void);

/** Free counts statistics block.
* Called from Python
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/posix/threading.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ sys_thread_t *sys_thread(void *(*run_function) (void *), void *arg)
}


sys_thread_t *sys_thread_self()
sys_thread_t *sys_thread_self(void)
{
return _self;
}
Expand Down
2 changes: 1 addition & 1 deletion src/router_core/delivery.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ 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"]"
Expand Down
4 changes: 2 additions & 2 deletions src/router_core/module.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ typedef void (*qdrc_module_final_t) (void *module_context);
* @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); }
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,
Expand Down
4 changes: 2 additions & 2 deletions src/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,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) {
Expand Down Expand Up @@ -1645,7 +1645,7 @@ void qd_connection_invoke_deferred_impl(qd_connection_t *conn, qd_deferred_t cal
}


void *qd_connection_new_qd_deferred_call_t()
void *qd_connection_new_qd_deferred_call_t(void)
{
return new_qd_deferred_call_t();
}
Expand Down
2 changes: 1 addition & 1 deletion src/server_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,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
Expand Down
Loading

0 comments on commit fd94849

Please sign in to comment.