Mark functions that exit as noreturn

diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c
index b17e47e2e1618949772dd3ccfd3db592ddf643ca..49e84f35f8d2d1d54dcf77a54d130b9b91425275 100644 (file)
--- a/src/collectd-nagios.c
+++ b/src/collectd-nagios.c
@@ -245,6 +245,7 @@ static int match_range (range_t *range, double value)
        return (((ret - range->invert) == 0) ? 0 : 1);
 } /* int match_range */
 
+__attribute__((noreturn))
 static void usage (const char *name)
 {
        fprintf (stderr, "Usage: %s <-s socket> <-n value_spec> <-H hostname> [options]\n"

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 65271ddd3f424db9c3050979de59e70b328f7483..a5ed065d5340721cd484d60ebaf62c0a3ef0909d 100644 (file)
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -69,7 +69,8 @@ static int restart = 0;
 static char  *pidfile      = NULL;
 static pid_t  collectd_pid = 0;
 
-static void exit_usage (char *name)
+__attribute__((noreturn))
+static void exit_usage (const char *name)
 {
        printf ("Usage: %s <options> [-- <collectd options>]\n"
 

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index a970d03e1c752b53dbcab2cee6c28bb7fad86a1a..6f299174ad8ea38af32fc630d47f208905864dea 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -269,6 +269,7 @@ static void update_kstat (void)
 /* TODO
  * Remove all settings but `-f' and `-C'
  */
+__attribute__((noreturn))
 static void exit_usage (int status)
 {
        printf ("Usage: "PACKAGE_NAME" [OPTIONS]\n\n"