From: Arran Cudbard-Bell Date: Mon, 1 Mar 2021 15:21:56 +0000 (+0000) Subject: Quiet GCC X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=690c988e4f87d0538e290dd9fdd1e35dce437a17;p=thirdparty%2Ffreeradius-server.git Quiet GCC --- diff --git a/src/bin/dhcpclient.c b/src/bin/dhcpclient.c index e07d83ba432..3f2ca694915 100644 --- a/src/bin/dhcpclient.c +++ b/src/bin/dhcpclient.c @@ -120,7 +120,7 @@ static fr_table_num_sorted_t const request_types[] = { }; static size_t request_types_len = NUM_ELEMENTS(request_types); -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { DEBUG("Usage: dhcpclient [options] server[:port] []"); DEBUG("Send a DHCP request with provided RADIUS attrs and output response."); diff --git a/src/bin/radclient.c b/src/bin/radclient.c index ab3a999fe74..28378d3b1f2 100644 --- a/src/bin/radclient.c +++ b/src/bin/radclient.c @@ -134,7 +134,7 @@ fr_dict_attr_autoload_t radclient_dict_attr[] = { { NULL } }; -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "Usage: radclient [options] server[:port] []\n"); diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c index 1085517dc73..3910956961e 100644 --- a/src/bin/radiusd.c +++ b/src/bin/radiusd.c @@ -1030,7 +1030,7 @@ cleanup: /* * Display the syntax for starting this program. */ -static void NEVER_RETURNS usage(main_config_t const *config, int status) +static NEVER_RETURNS void usage(main_config_t const *config, int status) { FILE *output = status ? stderr : stdout; diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c index de2b49521c4..4548144b9d5 100644 --- a/src/bin/radsniff.c +++ b/src/bin/radsniff.c @@ -106,7 +106,7 @@ fr_dict_attr_autoload_t radsniff_dict_attr[] = { { NULL } }; -static void NEVER_RETURNS usage(int status); +static NEVER_RETURNS void usage(int status); /** Fork and kill the parent process, writing out our PID * @@ -2191,7 +2191,7 @@ fr_event_list_t *list, int fd, int UNUSED flags, UNUSED void *ctx) } } -static void NEVER_RETURNS usage(int status) +static NEVER_RETURNS void usage(int status) { FILE *output = status ? stderr : stdout; fprintf(output, "Usage: radsniff [options][stats options] -- [pcap files]\n"); diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c index fd4846cc0fd..2448ee2e0e7 100644 --- a/src/bin/radsnmp.c +++ b/src/bin/radsnmp.c @@ -122,7 +122,7 @@ fr_dict_attr_autoload_t radsnmp_dict_attr[] = { { NULL } }; -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "Usage: radsnmp [options] server[:port] []\n"); diff --git a/src/bin/radwho.c b/src/bin/radwho.c index 513507b2152..397824de365 100644 --- a/src/bin/radwho.c +++ b/src/bin/radwho.c @@ -146,7 +146,7 @@ static char const *hostname(char *buf, size_t buflen, uint32_t ipaddr) /* * Print usage message and exit. */ -static void NEVER_RETURNS usage(int status) +static NEVER_RETURNS void usage(int status) { FILE *output = status?stderr:stdout; diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c index 82bee056446..1d15291a727 100644 --- a/src/bin/unit_test_map.c +++ b/src/bin/unit_test_map.c @@ -57,7 +57,7 @@ fr_dict_autoload_t unit_test_module_dict[] = { }; -static void NEVER_RETURNS usage(char *argv[]) +static NEVER_RETURNS void usage(char *argv[]) { fprintf(stderr, "usage: %s [OPTS] filename ...\n", argv[0]); fprintf(stderr, " -d Set user dictionary directory (defaults to " RADDBDIR ").\n"); diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c index 97286d6ac7e..a3d9149afd8 100644 --- a/src/bin/unit_test_module.c +++ b/src/bin/unit_test_module.c @@ -1058,7 +1058,7 @@ cleanup: /* * Display the syntax for starting this program. */ -static void NEVER_RETURNS usage(main_config_t const *config, int status) +static NEVER_RETURNS void usage(main_config_t const *config, int status) { FILE *output = status ? stderr : stdout; diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c index 53276cbff49..4070634d362 100644 --- a/src/lib/util/debug.c +++ b/src/lib/util/debug.c @@ -1411,7 +1411,7 @@ void _fr_assert_fatal(char const *file, int line, char const *expr, char const * * @param[in] now Exit immediately. */ #ifndef NDEBUG -void NEVER_RETURNS _fr_exit(char const *file, int line, int status, bool now) +NEVER_RETURNS void _fr_exit(char const *file, int line, int status, bool now) { if (status != EXIT_SUCCESS) { char const *error = fr_strerror(); @@ -1430,7 +1430,7 @@ void NEVER_RETURNS _fr_exit(char const *file, int line, int status, bool now) exit(status); } #else -void NEVER_RETURNS _fr_exit(UNUSED char const *file, UNUSED int line, int status, bool now) +NEVER_RETURNS void _fr_exit(UNUSED char const *file, UNUSED int line, int status, bool now) { if (status != EXIT_SUCCESS) fr_debug_break(false); /* If running under GDB we'll break here */ diff --git a/src/lib/util/debug.h b/src/lib/util/debug.h index c52cb5521a2..f70bf251b0a 100644 --- a/src/lib/util/debug.h +++ b/src/lib/util/debug.h @@ -110,10 +110,10 @@ void fr_fault_log_hex(uint8_t const *data, size_t data_len); bool _fr_assert_fail(char const *file, int line, char const *expr, char const *msg, ...) CC_HINT(format (printf, 4, 5)); -void NEVER_RETURNS _fr_assert_fatal(char const *file, int line, char const *expr, char const *msg, ...) +NEVER_RETURNS void _fr_assert_fatal(char const *file, int line, char const *expr, char const *msg, ...) CC_HINT(format (printf, 4, 5)); -void NEVER_RETURNS _fr_exit(char const *file, int line, int status, bool now); +NEVER_RETURNS void _fr_exit(char const *file, int line, int status, bool now); /** @} */ /** @name Assertion and exit macros diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c index 612bd9b4002..2bcd538a7f2 100644 --- a/src/listen/control/radmin.c +++ b/src/listen/control/radmin.c @@ -160,7 +160,7 @@ static char *stack[MAX_STACK]; static fr_cmd_t *local_cmds = NULL; -static void NEVER_RETURNS usage(int status) +static NEVER_RETURNS void usage(int status) { FILE *output = status ? stderr : stdout; fprintf(output, "Usage: %s [ args ]\n", progname); diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c index 14cb570c735..b17b1e84cd4 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c @@ -82,7 +82,7 @@ void T_PRF(unsigned char const *secret, unsigned int secret_len, } // http://stackoverflow.com/a/29838852 -static void NEVER_RETURNS handleErrors(void) +static NEVER_RETURNS void handleErrors(void) { unsigned long errCode; diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c index 1547c161cc0..772e7c0d075 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c @@ -197,7 +197,7 @@ static char lua_remove_cmd[] = "redis.call('DEL', '{' .. KEYS[1] .. '}:"IPPOOL_OWNER_KEY":' .. found)" EOL /* 11 */ "return 1" EOL; /* 12 */ -static void NEVER_RETURNS usage(int ret) { +static NEVER_RETURNS void usage(int ret) { INFO("Usage: %s -adrsm range... [-p prefix_len]... [-x]... [-oShf] server[:port] [pool] [range id]", name); INFO("Pool management:"); INFO(" -a range Add address(es)/prefix(es) to the pool."); diff --git a/src/tests/util/atomic_queue_test.c b/src/tests/util/atomic_queue_test.c index e1d5f42f708..d390dca3f3d 100644 --- a/src/tests/util/atomic_queue_test.c +++ b/src/tests/util/atomic_queue_test.c @@ -48,7 +48,7 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t * /**********************************************************************/ -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: atomic_queue_test [OPTS]\n"); fprintf(stderr, " -s size set queue size.\n"); diff --git a/src/tests/util/channel_test.c b/src/tests/util/channel_test.c index 72273c0d172..d322ff20be7 100644 --- a/src/tests/util/channel_test.c +++ b/src/tests/util/channel_test.c @@ -65,7 +65,7 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t c /**********************************************************************/ -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: channel_test [OPTS]\n"); fprintf(stderr, " -c Size of the control plane queue.\n"); diff --git a/src/tests/util/control_test.c b/src/tests/util/control_test.c index 2cda9e9a42c..56090248a99 100644 --- a/src/tests/util/control_test.c +++ b/src/tests/util/control_test.c @@ -66,7 +66,7 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t * /**********************************************************************/ -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: control_test [OPTS]\n"); fprintf(stderr, " -m Send number of messages.\n"); diff --git a/src/tests/util/message_set_test.c b/src/tests/util/message_set_test.c index 776fe05dc14..ad2272f781d 100644 --- a/src/tests/util/message_set_test.c +++ b/src/tests/util/message_set_test.c @@ -175,7 +175,7 @@ static void free_blocks(UNUSED fr_message_set_t *ms, UNUSED uint32_t *seed, int } } -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: message_set_test [OPTS]\n"); fprintf(stderr, " -s Set random seed to .\n"); diff --git a/src/tests/util/radius1_test.c b/src/tests/util/radius1_test.c index 9bd221aa189..2fb4ce529a4 100644 --- a/src/tests/util/radius1_test.c +++ b/src/tests/util/radius1_test.c @@ -77,7 +77,7 @@ static char const *secret = "testing123"; static fr_schedule_worker_t workers[MAX_WORKERS]; -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: radius_test [OPTS]\n"); fprintf(stderr, " -c Size of the control plane queue.\n"); diff --git a/src/tests/util/radius_schedule_test.c b/src/tests/util/radius_schedule_test.c index 7c8ddf0f1f7..33dd3e16a83 100644 --- a/src/tests/util/radius_schedule_test.c +++ b/src/tests/util/radius_schedule_test.c @@ -202,7 +202,7 @@ static fr_app_t test_app = { .entry_point_set = entry_point_set, }; -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: schedule_test [OPTS]\n"); fprintf(stderr, " -n Start num network threads\n"); diff --git a/src/tests/util/ring_buffer_test.c b/src/tests/util/ring_buffer_test.c index 13c78011896..f299579618f 100644 --- a/src/tests/util/ring_buffer_test.c +++ b/src/tests/util/ring_buffer_test.c @@ -122,7 +122,7 @@ static void free_blocks(fr_ring_buffer_t *rb, UNUSED uint32_t *seed, int *start } } -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: ring_buffer_test [OPTS]\n"); fprintf(stderr, " -x Debugging mode.\n"); diff --git a/src/tests/util/schedule_test.c b/src/tests/util/schedule_test.c index e9efbfc9efb..3f43758578d 100644 --- a/src/tests/util/schedule_test.c +++ b/src/tests/util/schedule_test.c @@ -42,7 +42,7 @@ RCSID("$Id$") static int debug_lvl = 0; -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: schedule_test [OPTS]\n"); fprintf(stderr, " -n Start num network threads\n"); diff --git a/src/tests/util/worker_test.c b/src/tests/util/worker_test.c index 7bf5aa1eee8..0e6d3585dd6 100644 --- a/src/tests/util/worker_test.c +++ b/src/tests/util/worker_test.c @@ -79,7 +79,7 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t c /**********************************************************************/ -static void NEVER_RETURNS usage(void) +static NEVER_RETURNS void usage(void) { fprintf(stderr, "usage: worker_test [OPTS]\n"); fprintf(stderr, " -c Size of the control plane queue.\n");