1 files changed, 28 insertions, 25 deletions

diff --git a/plugins/utils.h b/plugins/utils.h
index 92a6c115..68ff1630 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -32,8 +32,6 @@ suite of plugins. */
 void support(void);
 void print_revision(const char *, const char *);
 
-extern time_t start_time, end_time;
-
 /* Test input types */
 
 bool is_integer(char *);
@@ -76,7 +74,7 @@ char *strnl(char *);
 char *strpcpy(char *, const char *, const char *);
 char *strpcat(char *, const char *, const char *);
 int xvasprintf(char **strp, const char *fmt, va_list ap);
-int xasprintf(char **strp, const char *fmt, ...);
+int xasprintf(char **strp, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 
 void usage(const char *) __attribute__((noreturn));
 void usage2(const char *, const char *) __attribute__((noreturn));
@@ -88,13 +86,17 @@ void usage_va(const char *fmt, ...) __attribute__((noreturn));
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 #define min(a, b) (((a) < (b)) ? (a) : (b))
 
-char *perfdata(const char *, long int, const char *, bool, long int, bool, long int, bool, long int, bool, long int);
+char *perfdata(const char *, long int, const char *, bool, long int, bool, long int, bool, long int,
+                           bool, long int);
 
-char *perfdata_uint64(const char *, uint64_t, const char *, bool, uint64_t, bool, uint64_t, bool, uint64_t, bool, uint64_t);
+char *perfdata_uint64(const char *, uint64_t, const char *, bool, uint64_t, bool, uint64_t, bool,
+                                          uint64_t, bool, uint64_t);
 
-char *perfdata_int64(const char *, int64_t, const char *, bool, int64_t, bool, int64_t, bool, int64_t, bool, int64_t);
+char *perfdata_int64(const char *, int64_t, const char *, bool, int64_t, bool, int64_t, bool,
+                                         int64_t, bool, int64_t);
 
-char *fperfdata(const char *, double, const char *, bool, double, bool, double, bool, double, bool, double);
+char *fperfdata(const char *, double, const char *, bool, double, bool, double, bool, double, bool,
+                                double);
 
 char *sperfdata(const char *, double, const char *, char *, char *, bool, double, bool, double);
 
@@ -104,21 +106,22 @@ char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int,
    most will or should.  Therefore, for consistency, these very common
    options should have only these meanings throughout the overall suite */
 
-#define STD_LONG_OPTS                                                                                                                      \
-        {"version", no_argument, 0, 'V'}, {"verbose", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'},                                     \
-                {"timeout", required_argument, 0, 't'}, {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},           \
+#define STD_LONG_OPTS                                                                              \
+        {"version", no_argument, 0, 'V'}, {"verbose", no_argument, 0, 'v'},                            \
+                {"help", no_argument, 0, 'h'}, {"timeout", required_argument, 0, 't'},                     \
+                {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},           \
                 {"hostname", required_argument, 0, 'H'}
 
-#define COPYRIGHT                                                                                                                          \
+#define COPYRIGHT                                                                                  \
         "Copyright (c) %s Monitoring Plugins Development Team\n\
 \t<%s>\n\n"
 
-#define UT_HLP_VRS                                                                                                                         \
+#define UT_HLP_VRS                                                                                 \
         _("\
        %s (-h | --help) for detailed help\n\
        %s (-V | --version) for version information\n")
 
-#define UT_HELP_VRSN                                                                                                                       \
+#define UT_HELP_VRSN                                                                               \
         _("\
 \nOptions:\n\
  -h, --help\n\
@@ -126,52 +129,52 @@ char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int,
  -V, --version\n\
     Print version information\n")
 
-#define UT_HOST_PORT                                                                                                                       \
+#define UT_HOST_PORT                                                                               \
         _("\
  -H, --hostname=ADDRESS\n\
     Host name, IP Address, or unix socket (must be an absolute path)\n\
  -%c, --port=INTEGER\n\
     Port number (default: %s)\n")
 
-#define UT_IPv46                                                                                                                           \
+#define UT_IPv46                                                                                   \
         _("\
  -4, --use-ipv4\n\
     Use IPv4 connection\n\
  -6, --use-ipv6\n\
     Use IPv6 connection\n")
 
-#define UT_VERBOSE                                                                                                                         \
+#define UT_VERBOSE                                                                                 \
         _("\
  -v, --verbose\n\
     Show details for command-line debugging (output may be truncated by\n\
     the monitoring system)\n")
 
-#define UT_WARN_CRIT                                                                                                                       \
+#define UT_WARN_CRIT                                                                               \
         _("\
  -w, --warning=DOUBLE\n\
     Response time to result in warning status (seconds)\n\
  -c, --critical=DOUBLE\n\
     Response time to result in critical status (seconds)\n")
 
-#define UT_WARN_CRIT_RANGE                                                                                                                 \
+#define UT_WARN_CRIT_RANGE                                                                         \
         _("\
  -w, --warning=RANGE\n\
     Warning range (format: start:end). Alert if outside this range\n\
  -c, --critical=RANGE\n\
     Critical range\n")
 
-#define UT_CONN_TIMEOUT                                                                                                                    \
+#define UT_CONN_TIMEOUT                                                                            \
         _("\
  -t, --timeout=INTEGER\n\
     Seconds before connection times out (default: %d)\n")
 
-#define UT_PLUG_TIMEOUT                                                                                                                    \
+#define UT_PLUG_TIMEOUT                                                                            \
         _("\
  -t, --timeout=INTEGER\n\
     Seconds before plugin times out (default: %d)\n")
 
 #ifdef NP_EXTRA_OPTS
-#       define UT_EXTRA_OPTS                                                                                                                  \
+#       define UT_EXTRA_OPTS                                                                          \
                 _("\
  --extra-opts=[section][@file]\n\
     Read options from an ini file. See\n\
@@ -181,25 +184,25 @@ char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int,
 #       define UT_EXTRA_OPTS " \b"
 #endif
 
-#define UT_THRESHOLDS_NOTES                                                                                                                \
+#define UT_THRESHOLDS_NOTES                                                                        \
         _("\
  See:\n\
  https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
  for THRESHOLD format and examples.\n")
 
-#define UT_SUPPORT                                                                                                                         \
+#define UT_SUPPORT                                                                                 \
         _("\n\
 Send email to help@monitoring-plugins.org if you have questions regarding\n\
 use of this software. To submit patches or suggest improvements, send email\n\
 to devel@monitoring-plugins.org\n\n")
 
-#define UT_NOWARRANTY                                                                                                                      \
+#define UT_NOWARRANTY                                                                              \
         _("\n\
 The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
 copies of the plugins under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n")
 
-#define UT_OUTPUT_FORMAT                                                                                                                   \
+#define UT_OUTPUT_FORMAT                                                                           \
         _("\
  --output-format=OUTPUT_FORMAT\n\
     Select output format. Valid values: \"multi-line\", \"mp-test-json\"\n")