Quiet GCC

diff --git a/src/bin/dhcpclient.c b/src/bin/dhcpclient.c
index e07d83ba4326eee187bf53c989a8807955650141..3f2ca694915bc5ee89672f19847a18f02088c2a2 100644 (file)
--- 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] [<command>]");
        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 ab3a999fe749ff45f2b0c930af523f051c440284..28378d3b1f2bf93bf398b01fde7b345e9f4aaf2c 100644 (file)
--- 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] <command> [<secret>]\n");
 

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 1085517dc73d3951e92f7376d2ad677d7b206f7c..3910956961e4480fb803fdceb38e9f3befa20ecf 100644 (file)
--- 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 de2b49521c4cc85d78489768192e150257514a40..4548144b9d517510f5ec483bbf6a08c21f9bf05b 100644 (file)
--- 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 fd4846cc0fd15969780cc585973aa80a30315142..2448ee2e0e79274e31b9438e891d29cdbce62e0b 100644 (file)
--- 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] [<secret>]\n");
 

diff --git a/src/bin/radwho.c b/src/bin/radwho.c
index 513507b215297010a0a1f1dbfac8ce2f1e987ecf..397824de3657aafdbe4220c592e0d185f679af76 100644 (file)
--- 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 82bee056446c2fdf75d9effefa998bd8a99c21ed..1d15291a727a0a3947278af96812d932b897956c 100644 (file)
--- 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 <raddb>         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 97286d6ac7ec42041059da775c48488dfd10543f..a3d9149afd8b682c7d301f9a3157c62bdb035a44 100644 (file)
--- 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 53276cbff4914999610f93bf1ee764b2dcd278e4..4070634d362285973ff930baebdbc11c7735c85e 100644 (file)
--- 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 c52cb5521a20cc93c87a56b22bcc557897bd045d..f70bf251b0a8709844f5bcea2f85b190d8cea608 100644 (file)
--- 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 612bd9b4002b40a194afcd63afd29c84ae2cba19..2bcd538a7f2ed11c824f8420b714293dfc9d6a42 100644 (file)
--- 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 14cb570c7355838b6614fc7608a0e7a6095c720a..b17b1e84cd4598f0892c803ce39771fd778b928b 100644 (file)
--- 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 1547c161cc0a9099c5062f2fa578e566e1315bf2..772e7c0d075a44b0f6a9725805356032cc74d555 100644 (file)
--- 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 e1d5f42f708e9a839e4006df65ea3bec324a3361..d390dca3f3dbed03fa143f52a9214472958c8e62 100644 (file)
--- 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 72273c0d17224bc8be3c538f1bd1c81a51221e10..d322ff20be747104b209c6e9b6c68872e2f19fb7 100644 (file)
--- 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 <control-plane>     Size of the control plane queue.\n");

diff --git a/src/tests/util/control_test.c b/src/tests/util/control_test.c
index 2cda9e9a42cea1fe9134386d9d66e59b97190438..56090248a9985bfab00f5c40c10640efdb06c25f 100644 (file)
--- 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 <messages>          Send number of messages.\n");

diff --git a/src/tests/util/message_set_test.c b/src/tests/util/message_set_test.c
index 776fe05dc1406003d199438382476f7919097867..ad2272f781d674ebb18581b236d1048e7b4fd85d 100644 (file)
--- 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 <string>            Set random seed to <string>.\n");

diff --git a/src/tests/util/radius1_test.c b/src/tests/util/radius1_test.c
index 9bd221aa18900cb8050de875ab1de77cc9fd3729..2fb4ce529a4c5d0910f3f9201c4d0f9a8451a16f 100644 (file)
--- 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 <control-plane>     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 7c8ddf0f1f71360c44a89994d1144a11f6645368..33dd3e16a83fb3fb9cb88eded825e33152a454fd 100644 (file)
--- 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 <num>               Start num network threads\n");

diff --git a/src/tests/util/ring_buffer_test.c b/src/tests/util/ring_buffer_test.c
index 13c78011896998966ee695bc6d600884cdbbf039..f299579618fe501931e1b8a251b7990b7c0469ff 100644 (file)
--- 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 e9efbfc9efb297d4ad811d34023e9d3fe221294f..3f43758578d4c824448e19f1d2d39a2b3a3f7040 100644 (file)
--- 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 <num>               Start num network threads\n");

diff --git a/src/tests/util/worker_test.c b/src/tests/util/worker_test.c
index 7bf5aa1eee818de310a520d465370db886ef6323..0e6d3585dd6b104c3952265b51cd10eed62bcddb 100644 (file)
--- 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 <control-plane>     Size of the control plane queue.\n");