46 files changed, 12417 insertions, 13914 deletions

diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 5c0f6e2..5e4021b 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -3,7 +3,7 @@
 * Monitoring check_apt plugin
 *
 * License: GPL
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
+* Copyright (c) 2006-2024 Monitoring Plugins Development Team
 *
 * Original author: Sean Finney
 *
@@ -30,7 +30,7 @@
 *****************************************************************************/
 
 const char *progname = "check_apt";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 2a23b39..905b239 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -1,33 +1,33 @@
 /*****************************************************************************
-* 
-* Monitoring check_by_ssh plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_by_ssh plugin
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_by_ssh plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_by_ssh plugin
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_by_ssh";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -36,82 +36,80 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils_cmd.h"
 
 #ifndef NP_MAXARGS
-#define NP_MAXARGS 1024
+#       define NP_MAXARGS 1024
 #endif
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void comm_append (const char *);
-void print_help (void);
-void print_usage (void);
-
-unsigned int commands = 0;
-unsigned int services = 0;
-int skip_stdout = 0;
-int skip_stderr = 0;
-int warn_on_stderr = 0;
-bool unknown_timeout = false;
-char *remotecmd = NULL;
-char **commargv = NULL;
-int commargc = 0;
-char *hostname = NULL;
-char *outputfile = NULL;
-char *host_shortname = NULL;
-char **service;
-bool passive = false;
-bool verbose = false;
-
-int
-main (int argc, char **argv)
-{
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static void comm_append(const char * /*str*/);
+static void print_help(void);
+void print_usage(void);
+
+static unsigned int commands = 0;
+static unsigned int services = 0;
+static int skip_stdout = 0;
+static int skip_stderr = 0;
+static int warn_on_stderr = 0;
+static bool unknown_timeout = false;
+static char *remotecmd = NULL;
+static char **commargv = NULL;
+static int commargc = 0;
+static char *hostname = NULL;
+static char *outputfile = NULL;
+static char *host_shortname = NULL;
+static char **service;
+static bool passive = false;
+static bool verbose = false;
+
+int main(int argc, char **argv) {
 
         char *status_text;
         int cresult;
         int result = STATE_UNKNOWN;
         time_t local_time;
-        FILE *fp = NULL;
-        output chld_out, chld_err;
+        FILE *file_pointer = NULL;
+        output chld_out;
+        output chld_err;
 
         remotecmd = "";
         comm_append(SSH_COMMAND);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
         /* process arguments */
-        if (process_arguments (argc, argv) == ERROR)
+        if (process_arguments(argc, argv) == ERROR)
                 usage_va(_("Could not parse arguments"));
 
         /* Set signal handling and alarm timeout */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
         }
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
         /* run the command */
         if (verbose) {
-                printf ("Command: %s\n", commargv[0]);
+                printf("Command: %s\n", commargv[0]);
                 for (int i = 1; i < commargc; i++)
-                        printf ("Argument %i: %s\n", i, commargv[i]);
+                        printf("Argument %i: %s\n", i, commargv[i]);
         }
 
-        result = cmd_run_array (commargv, &chld_out, &chld_err, 0);
+        result = cmd_run_array(commargv, &chld_out, &chld_err, 0);
 
         /* SSH returns 255 if connection attempt fails; include the first line of error output */
         if (result == 255 && unknown_timeout) {
-                printf (_("SSH connection failed: %s\n"),
-                        chld_err.lines > 0 ? chld_err.line[0] : "(no error output)");
+                printf(_("SSH connection failed: %s\n"), chld_err.lines > 0 ? chld_err.line[0] : "(no error output)");
                 return STATE_UNKNOWN;
         }
 
         if (verbose) {
-                for(size_t i = 0; i < chld_out.lines; i++)
+                for (size_t i = 0; i < chld_out.lines; i++)
                         printf("stdout: %s\n", chld_out.line[i]);
-                for(size_t i = 0; i < chld_err.lines; i++)
+                for (size_t i = 0; i < chld_err.lines; i++)
                         printf("stderr: %s\n", chld_err.line[i]);
         }
 
@@ -121,155 +119,144 @@ main (int argc, char **argv)
                 skip_stderr = chld_err.lines;
 
         /* UNKNOWN or worse if (non-skipped) output found on stderr */
-        if(chld_err.lines > (size_t)skip_stderr) {
-                printf (_("Remote command execution failed: %s\n"),
-                        chld_err.line[skip_stderr]);
-                if ( warn_on_stderr ) 
+        if (chld_err.lines > (size_t)skip_stderr) {
+                printf(_("Remote command execution failed: %s\n"), chld_err.line[skip_stderr]);
+                if (warn_on_stderr)
                         return max_state_alt(result, STATE_WARNING);
-                else
-                        return max_state_alt(result, STATE_UNKNOWN);
+                return max_state_alt(result, STATE_UNKNOWN);
         }
 
         /* this is simple if we're not supposed to be passive.
          * Wrap up quickly and keep the tricks below */
-        if(!passive) {
+        if (!passive) {
                 if (chld_out.lines > (size_t)skip_stdout)
                         for (size_t i = skip_stdout; i < chld_out.lines; i++)
-                                puts (chld_out.line[i]);
+                                puts(chld_out.line[i]);
                 else
-                        printf (_("%s - check_by_ssh: Remote command '%s' returned status %d\n"),
-                                state_text(result), remotecmd, result);
-                return result;  /* return error status from remote command */
+                        printf(_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), state_text(result), remotecmd, result);
+                return result; /* return error status from remote command */
         }
 
-
         /*
          * Passive mode
          */
 
         /* process output */
-        if (!(fp = fopen (outputfile, "a"))) {
-                printf (_("SSH WARNING: could not open %s\n"), outputfile);
-                exit (STATE_UNKNOWN);
+        if (!(file_pointer = fopen(outputfile, "a"))) {
+                printf(_("SSH WARNING: could not open %s\n"), outputfile);
+                exit(STATE_UNKNOWN);
         }
 
-        local_time = time (NULL);
+        local_time = time(NULL);
         commands = 0;
-        for(size_t i = skip_stdout; i < chld_out.lines; i++) {
+        for (size_t i = skip_stdout; i < chld_out.lines; i++) {
                 status_text = chld_out.line[i++];
-                if (i == chld_out.lines || strstr (chld_out.line[i], "STATUS CODE: ") == NULL)
-                        die (STATE_UNKNOWN, _("%s: Error parsing output\n"), progname);
-
-                if (service[commands] && status_text
-                        && sscanf (chld_out.line[i], "STATUS CODE: %d", &cresult) == 1)
-                {
-                        fprintf (fp, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n",
-                                 (int) local_time, host_shortname, service[commands++],
-                                 cresult, status_text);
+                if (i == chld_out.lines || strstr(chld_out.line[i], "STATUS CODE: ") == NULL)
+                        die(STATE_UNKNOWN, _("%s: Error parsing output\n"), progname);
+
+                if (service[commands] && status_text && sscanf(chld_out.line[i], "STATUS CODE: %d", &cresult) == 1) {
+                        fprintf(file_pointer, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n", (int)local_time, host_shortname, service[commands++],
+                                        cresult, status_text);
                 }
         }
-        
+
         /* Multiple commands and passive checking should always return OK */
         return result;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
         int c;
-        char *p1, *p2;
+        char *p1;
+        char *p2;
 
         int option = 0;
-        static struct option longopts[] = {
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {"fork", no_argument, 0, 'f'},
-                {"timeout", required_argument, 0, 't'},
-                {"unknown-timeout", no_argument, 0, 'U'},
-                {"host", required_argument, 0, 'H'},    /* backward compatibility */
-                {"hostname", required_argument, 0, 'H'},
-                {"port", required_argument,0,'p'},
-                {"output", required_argument, 0, 'O'},
-                {"name", required_argument, 0, 'n'},
-                {"services", required_argument, 0, 's'},
-                {"identity", required_argument, 0, 'i'},
-                {"user", required_argument, 0, 'u'},
-                {"logname", required_argument, 0, 'l'},
-                {"command", required_argument, 0, 'C'},
-                {"skip", optional_argument, 0, 'S'}, /* backwards compatibility */
-                {"skip-stdout", optional_argument, 0, 'S'},
-                {"skip-stderr", optional_argument, 0, 'E'},
-                {"warn-on-stderr", no_argument, 0, 'W'},
-                {"proto1", no_argument, 0, '1'},
-                {"proto2", no_argument, 0, '2'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {"ssh-option", required_argument, 0, 'o'},
-                {"quiet", no_argument, 0, 'q'},
-                {"configfile", optional_argument, 0, 'F'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {{"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"fork", no_argument, 0, 'f'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"unknown-timeout", no_argument, 0, 'U'},
+                                                                           {"host", required_argument, 0, 'H'}, /* backward compatibility */
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"output", required_argument, 0, 'O'},
+                                                                           {"name", required_argument, 0, 'n'},
+                                                                           {"services", required_argument, 0, 's'},
+                                                                           {"identity", required_argument, 0, 'i'},
+                                                                           {"user", required_argument, 0, 'u'},
+                                                                           {"logname", required_argument, 0, 'l'},
+                                                                           {"command", required_argument, 0, 'C'},
+                                                                           {"skip", optional_argument, 0, 'S'}, /* backwards compatibility */
+                                                                           {"skip-stdout", optional_argument, 0, 'S'},
+                                                                           {"skip-stderr", optional_argument, 0, 'E'},
+                                                                           {"warn-on-stderr", no_argument, 0, 'W'},
+                                                                           {"proto1", no_argument, 0, '1'},
+                                                                           {"proto2", no_argument, 0, '2'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"ssh-option", required_argument, 0, 'o'},
+                                                                           {"quiet", no_argument, 0, 'q'},
+                                                                           {"configfile", optional_argument, 0, 'F'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
         for (c = 1; c < argc; c++)
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
 
         while (1) {
-                c = getopt_long (argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts,
-                                 &option);
+                c = getopt_long(argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, &option);
 
                 if (c == -1 || c == EOF)
                         break;
 
                 switch (c) {
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'v':                                                                       /* help */
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'v': /* help */
                         verbose = true;
                         break;
-                case 't':                                                                       /* timeout period */
-                        if (!is_integer (optarg))
+                case 't': /* timeout period */
+                        if (!is_integer(optarg))
                                 usage_va(_("Timeout interval must be a positive integer"));
                         else
-                                timeout_interval = atoi (optarg);
+                                timeout_interval = atoi(optarg);
                         break;
                 case 'U':
                         unknown_timeout = true;
                         break;
-                case 'H':                                                                       /* host */
+                case 'H': /* host */
                         hostname = optarg;
                         break;
                 case 'p': /* port number */
-                        if (!is_integer (optarg))
+                        if (!is_integer(optarg))
                                 usage_va(_("Port must be a positive integer"));
                         comm_append("-p");
                         comm_append(optarg);
                         break;
-                case 'O':                                                                       /* output file */
+                case 'O': /* output file */
                         outputfile = optarg;
                         passive = true;
                         break;
-                case 's':                                                                       /* description of service to check */
+                case 's': /* description of service to check */
                         p1 = optarg;
-                        service = realloc (service, (++services) * sizeof(char *));
-                        while ((p2 = index (p1, ':'))) {
+                        service = realloc(service, (++services) * sizeof(char *));
+                        while ((p2 = index(p1, ':'))) {
                                 *p2 = '\0';
                                 service[services - 1] = p1;
-                                service = realloc (service, (++services) * sizeof(char *));
+                                service = realloc(service, (++services) * sizeof(char *));
                                 p1 = p2 + 1;
                         }
                         service[services - 1] = p1;
                         break;
-                case 'n':                                                                       /* short name of host in the monitoring configuration */
+                case 'n': /* short name of host in the monitoring configuration */
                         host_shortname = optarg;
                         break;
 
@@ -277,67 +264,67 @@ process_arguments (int argc, char **argv)
                         comm_append("-l");
                         comm_append(optarg);
                         break;
-                case 'l':                                                                       /* login name */
+                case 'l': /* login name */
                         comm_append("-l");
                         comm_append(optarg);
                         break;
-                case 'i':                                                                       /* identity */
+                case 'i': /* identity */
                         comm_append("-i");
                         comm_append(optarg);
                         break;
 
-                case '1':                                                                       /* Pass these switches directly to ssh */
+                case '1': /* Pass these switches directly to ssh */
                         comm_append("-1");
                         break;
-                case '2':                                                                       /* 1 to force version 1, 2 to force version 2 */
+                case '2': /* 1 to force version 1, 2 to force version 2 */
                         comm_append("-2");
                         break;
-                case '4':                                                                       /* -4 for IPv4 */
+                case '4': /* -4 for IPv4 */
                         comm_append("-4");
                         break;
-                case '6':                                                               /* -6 for IPv6 */
+                case '6': /* -6 for IPv6 */
                         comm_append("-6");
                         break;
-                case 'f':                                                                       /* fork to background */
+                case 'f': /* fork to background */
                         comm_append("-f");
                         break;
-                case 'C':                                                                       /* Command for remote machine */
+                case 'C': /* Command for remote machine */
                         commands++;
                         if (commands > 1)
-                                xasprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
-                        xasprintf (&remotecmd, "%s%s", remotecmd, optarg);
+                                xasprintf(&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
+                        xasprintf(&remotecmd, "%s%s", remotecmd, optarg);
                         break;
-                case 'S':                                                                       /* skip n (or all) lines on stdout */
+                case 'S': /* skip n (or all) lines on stdout */
                         if (optarg == NULL)
                                 skip_stdout = -1; /* skip all output on stdout */
-                        else if (!is_integer (optarg))
+                        else if (!is_integer(optarg))
                                 usage_va(_("skip-stdout argument must be an integer"));
                         else
-                                skip_stdout = atoi (optarg);
+                                skip_stdout = atoi(optarg);
                         break;
-                case 'E':                                                                       /* skip n (or all) lines on stderr */
+                case 'E': /* skip n (or all) lines on stderr */
                         if (optarg == NULL)
                                 skip_stderr = -1; /* skip all output on stderr */
-                        else if (!is_integer (optarg))
+                        else if (!is_integer(optarg))
                                 usage_va(_("skip-stderr argument must be an integer"));
                         else
-                                skip_stderr = atoi (optarg);
+                                skip_stderr = atoi(optarg);
                         break;
-                case 'W':                                                                       /* exit with warning if there is an output on stderr */
+                case 'W': /* exit with warning if there is an output on stderr */
                         warn_on_stderr = 1;
                         break;
-                case 'o':                                                                       /* Extra options for the ssh command */
+                case 'o': /* Extra options for the ssh command */
                         comm_append("-o");
                         comm_append(optarg);
                         break;
-                case 'q':                                                                       /* Tell the ssh command to be quiet */
+                case 'q': /* Tell the ssh command to be quiet */
                         comm_append("-q");
                         break;
-                case 'F':                                                                       /* ssh configfile */
+                case 'F': /* ssh configfile */
                         comm_append("-F");
                         comm_append(optarg);
                         break;
-                default:                                                                        /* help */
+                default: /* help */
                         usage5();
                 }
         }
@@ -345,7 +332,7 @@ process_arguments (int argc, char **argv)
         c = optind;
         if (hostname == NULL) {
                 if (c <= argc) {
-                        die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
+                        die(STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
                 }
                 hostname = argv[c++];
         }
@@ -353,143 +340,130 @@ process_arguments (int argc, char **argv)
         if (strlen(remotecmd) == 0) {
                 for (; c < argc; c++)
                         if (strlen(remotecmd) > 0)
-                                xasprintf (&remotecmd, "%s %s", remotecmd, argv[c]);
+                                xasprintf(&remotecmd, "%s %s", remotecmd, argv[c]);
                         else
-                                xasprintf (&remotecmd, "%s", argv[c]);
+                                xasprintf(&remotecmd, "%s", argv[c]);
         }
 
         if (commands > 1 || passive)
-                xasprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
+                xasprintf(&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
 
-        if (remotecmd == NULL || strlen (remotecmd) <= 1)
+        if (remotecmd == NULL || strlen(remotecmd) <= 1)
                 usage_va(_("No remotecmd"));
 
         comm_append(hostname);
         comm_append(remotecmd);
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-
-void
-comm_append (const char *str)
-{
+void comm_append(const char *str) {
 
         if (++commargc > NP_MAXARGS)
                 die(STATE_UNKNOWN, _("%s: Argument limit of %d exceeded\n"), progname, NP_MAXARGS);
 
-        if ((commargv = (char **)realloc(commargv, (commargc+1) * sizeof(char *))) == NULL)
+        if ((commargv = (char **)realloc(commargv, (commargc + 1) * sizeof(char *))) == NULL)
                 die(STATE_UNKNOWN, _("Can not (re)allocate 'commargv' buffer\n"));
 
-        commargv[commargc-1] = strdup(str);
+        commargv[commargc - 1] = strdup(str);
         commargv[commargc] = NULL;
-
 }
 
-int
-validate_arguments (void)
-{
+int validate_arguments(void) {
         if (remotecmd == NULL || hostname == NULL)
                 return ERROR;
 
         if (passive && commands != services)
-                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
+                die(STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
 
         if (passive && host_shortname == NULL)
-                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname);
+                die(STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname);
 
         return OK;
 }
 
-
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf (_("This plugin uses SSH to execute commands on a remote host"));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_HOST_PORT, 'p', "none");
-
-        printf (UT_IPv46);
-
-  printf (" %s\n", "-1, --proto1");
-  printf ("    %s\n", _("tell ssh to use Protocol 1 [optional]"));
-  printf (" %s\n", "-2, --proto2");
-  printf ("    %s\n", _("tell ssh to use Protocol 2 [optional]"));
-  printf (" %s\n", "-S, --skip-stdout[=n]");
-  printf ("    %s\n", _("Ignore all or (if specified) first n lines on STDOUT [optional]"));
-  printf (" %s\n", "-E, --skip-stderr[=n]");
-  printf ("    %s\n", _("Ignore all or (if specified) first n lines on STDERR [optional]"));
-  printf (" %s\n", "-W, --warn-on-stderr]");
-  printf ("    %s\n", _("Exit with an warning, if there is an output on STDERR"));
-  printf (" %s\n", "-f");
-  printf ("    %s\n", _("tells ssh to fork rather than create a tty [optional]. This will always return OK if ssh is executed"));
-  printf (" %s\n","-C, --command='COMMAND STRING'");
-  printf ("    %s\n", _("command to execute on the remote machine"));
-  printf (" %s\n","-l, --logname=USERNAME");
-  printf ("    %s\n", _("SSH user name on remote host [optional]"));
-  printf (" %s\n","-i, --identity=KEYFILE");
-  printf ("    %s\n", _("identity of an authorized key [optional]"));
-  printf (" %s\n","-O, --output=FILE");
-  printf ("    %s\n", _("external command file for monitoring [optional]"));
-  printf (" %s\n","-s, --services=LIST");
-  printf ("    %s\n", _("list of monitoring service names, separated by ':' [optional]"));
-  printf (" %s\n","-n, --name=NAME");
-  printf ("    %s\n", _("short name of host in the monitoring configuration [optional]"));
-  printf (" %s\n","-o, --ssh-option=OPTION");
-  printf ("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
-  printf (" %s\n","-F, --configfile");
-  printf ("    %s\n", _("Tell ssh to use this configfile [optional]"));
-  printf (" %s\n","-q, --quiet");
-  printf ("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
-        printf (UT_WARN_CRIT);
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf (" %s\n","-U, --unknown-timeout");
-        printf ("    %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL"));
-        printf (UT_VERBOSE);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf(_("This plugin uses SSH to execute commands on a remote host"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'p', "none");
+
+        printf(UT_IPv46);
+
+        printf(" %s\n", "-1, --proto1");
+        printf("    %s\n", _("tell ssh to use Protocol 1 [optional]"));
+        printf(" %s\n", "-2, --proto2");
+        printf("    %s\n", _("tell ssh to use Protocol 2 [optional]"));
+        printf(" %s\n", "-S, --skip-stdout[=n]");
+        printf("    %s\n", _("Ignore all or (if specified) first n lines on STDOUT [optional]"));
+        printf(" %s\n", "-E, --skip-stderr[=n]");
+        printf("    %s\n", _("Ignore all or (if specified) first n lines on STDERR [optional]"));
+        printf(" %s\n", "-W, --warn-on-stderr]");
+        printf("    %s\n", _("Exit with an warning, if there is an output on STDERR"));
+        printf(" %s\n", "-f");
+        printf("    %s\n", _("tells ssh to fork rather than create a tty [optional]. This will always return OK if ssh is executed"));
+        printf(" %s\n", "-C, --command='COMMAND STRING'");
+        printf("    %s\n", _("command to execute on the remote machine"));
+        printf(" %s\n", "-l, --logname=USERNAME");
+        printf("    %s\n", _("SSH user name on remote host [optional]"));
+        printf(" %s\n", "-i, --identity=KEYFILE");
+        printf("    %s\n", _("identity of an authorized key [optional]"));
+        printf(" %s\n", "-O, --output=FILE");
+        printf("    %s\n", _("external command file for monitoring [optional]"));
+        printf(" %s\n", "-s, --services=LIST");
+        printf("    %s\n", _("list of monitoring service names, separated by ':' [optional]"));
+        printf(" %s\n", "-n, --name=NAME");
+        printf("    %s\n", _("short name of host in the monitoring configuration [optional]"));
+        printf(" %s\n", "-o, --ssh-option=OPTION");
+        printf("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
+        printf(" %s\n", "-F, --configfile");
+        printf("    %s\n", _("Tell ssh to use this configfile [optional]"));
+        printf(" %s\n", "-q, --quiet");
+        printf("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
+        printf(UT_WARN_CRIT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(" %s\n", "-U, --unknown-timeout");
+        printf("    %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL"));
+        printf(UT_VERBOSE);
+        printf("\n");
+        printf(" %s\n", _("The most common mode of use is to refer to a local identity file with"));
+        printf(" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));
+        printf(" %s\n", _("passphrase and the public key should be listed in the authorized_keys"));
+        printf(" %s\n", _("file of the remote host. Usually the key will be restricted to running"));
+        printf(" %s\n", _("only one command on the remote server. If the remote SSH server tracks"));
+        printf(" %s\n", _("invocation arguments, the one remote program may be an agent that can"));
+        printf(" %s\n", _("execute additional commands as proxy"));
+        printf("\n");
+        printf(" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));
+        printf(" %s\n", _("all of -O, -s, and -n options (servicelist order must match '-C'options)"));
         printf("\n");
-  printf (" %s\n", _("The most common mode of use is to refer to a local identity file with"));
-  printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));
-  printf (" %s\n", _("passphrase and the public key should be listed in the authorized_keys"));
-  printf (" %s\n", _("file of the remote host. Usually the key will be restricted to running"));
-  printf (" %s\n", _("only one command on the remote server. If the remote SSH server tracks"));
-  printf (" %s\n", _("invocation arguments, the one remote program may be an agent that can"));
-  printf (" %s\n", _("execute additional commands as proxy"));
-  printf("\n");
-  printf (" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));
-  printf (" %s\n", _("all of -O, -s, and -n options (servicelist order must match '-C'options)"));
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C uptime -O /tmp/foo");
-  printf (" %s\n", "$ cat /tmp/foo");
-  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days");
-  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days");
-  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C uptime -O /tmp/foo");
+        printf(" %s\n", "$ cat /tmp/foo");
+        printf(" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days");
+        printf(" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days");
+        printf(" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");
 
         printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf (" %s -H <host> -C <command> [-fqvU] [-1|-2] [-4|-6]\n"
-                "       [-S [lines]] [-E [lines]] [-W] [-t timeout] [-i identity]\n"
-                "       [-l user] [-n name] [-s servicelist] [-O outputfile]\n"
-                "       [-p port] [-o ssh-option] [-F configfile]\n",
-                progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s -H <host> -C <command> [-fqvU] [-1|-2] [-4|-6]\n"
+                   "       [-S [lines]] [-E [lines]] [-W] [-t timeout] [-i identity]\n"
+                   "       [-l user] [-n name] [-s servicelist] [-O outputfile]\n"
+                   "       [-p port] [-o ssh-option] [-F configfile]\n",
+                   progname);
 }
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index e1ede9f..b40c38c 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -1,92 +1,92 @@
 /*****************************************************************************
-* 
-* check_cluster.c - Host and Service Cluster Plugin for Monitoring
-* 
-* License: GPL
-* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2007 Monitoring Plugins Development Team
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * check_cluster.c - Host and Service Cluster Plugin for Monitoring
+ *
+ * License: GPL
+ * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2007-2024 Monitoring Plugins Development Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_cluster";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "utils_base.h"
 
-#define CHECK_SERVICES  1
-#define CHECK_HOSTS     2
+enum {
+        CHECK_SERVICES = 1,
+        CHECK_HOSTS = 2
+};
 
-void print_help (void);
-void print_usage (void);
+static void print_help(void);
+void print_usage(void);
 
-int total_services_ok=0;
-int total_services_warning=0;
-int total_services_unknown=0;
-int total_services_critical=0;
+static int total_services_ok = 0;
+static int total_services_warning = 0;
+static int total_services_unknown = 0;
+static int total_services_critical = 0;
 
-int total_hosts_up=0;
-int total_hosts_down=0;
-int total_hosts_unreachable=0;
+static int total_hosts_up = 0;
+static int total_hosts_down = 0;
+static int total_hosts_unreachable = 0;
 
-char *warn_threshold;
-char *crit_threshold;
+static char *warn_threshold;
+static char *crit_threshold;
 
-int check_type=CHECK_SERVICES;
+static int check_type = CHECK_SERVICES;
 
-char *data_vals=NULL;
-char *label=NULL;
+static char *data_vals = NULL;
+static char *label = NULL;
 
-int verbose=0;
+static int verbose = 0;
 
-int process_arguments(int,char **);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
 
-
-
-int main(int argc, char **argv){
+int main(int argc, char **argv) {
         char *ptr;
         int data_val;
-        int return_code=STATE_OK;
+        int return_code = STATE_OK;
         thresholds *thresholds = NULL;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts(&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if(process_arguments(argc,argv)==ERROR)
+        if (process_arguments(argc, argv) == ERROR)
                 usage(_("Could not parse arguments"));
 
         /* Initialize the thresholds */
         set_thresholds(&thresholds, warn_threshold, crit_threshold);
-        if(verbose)
+        if (verbose)
                 print_thresholds("check_cluster", thresholds);
 
         /* check the data values */
-        for(ptr=strtok(data_vals,",");ptr!=NULL;ptr=strtok(NULL,",")){
+        for (ptr = strtok(data_vals, ","); ptr != NULL; ptr = strtok(NULL, ",")) {
 
-                data_val=atoi(ptr);
+                data_val = atoi(ptr);
 
-                if(check_type==CHECK_SERVICES){
-                        switch(data_val){
+                if (check_type == CHECK_SERVICES) {
+                        switch (data_val) {
                         case 0:
                                 total_services_ok++;
                                 break;
@@ -101,10 +101,9 @@ int main(int argc, char **argv){
                                 break;
                         default:
                                 break;
-                        }
-                }
-                else{
-                        switch(data_val){
+                        }
+                } else {
+                        switch (data_val) {
                         case 0:
                                 total_hosts_up++;
                                 break;
@@ -116,67 +115,54 @@ int main(int argc, char **argv){
                                 break;
                         default:
                                 break;
-                        }
-                }
-        }
-
+                        }
+                }
+        }
 
         /* return the status of the cluster */
-        if(check_type==CHECK_SERVICES){
-                return_code=get_status(total_services_warning+total_services_unknown+total_services_critical, thresholds);
-                printf("CLUSTER %s: %s: %d ok, %d warning, %d unknown, %d critical\n",
-                        state_text(return_code), (label==NULL)?"Service cluster":label,
-                        total_services_ok,total_services_warning,
-                        total_services_unknown,total_services_critical);
-        }
-        else{
-                return_code=get_status(total_hosts_down+total_hosts_unreachable, thresholds);
-                printf("CLUSTER %s: %s: %d up, %d down, %d unreachable\n",
-                        state_text(return_code), (label==NULL)?"Host cluster":label,
-                        total_hosts_up,total_hosts_down,total_hosts_unreachable);
+        if (check_type == CHECK_SERVICES) {
+                return_code = get_status(total_services_warning + total_services_unknown + total_services_critical, thresholds);
+                printf("CLUSTER %s: %s: %d ok, %d warning, %d unknown, %d critical\n", state_text(return_code),
+                           (label == NULL) ? "Service cluster" : label, total_services_ok, total_services_warning, total_services_unknown,
+                           total_services_critical);
+        } else {
+                return_code = get_status(total_hosts_down + total_hosts_unreachable, thresholds);
+                printf("CLUSTER %s: %s: %d up, %d down, %d unreachable\n", state_text(return_code), (label == NULL) ? "Host cluster" : label,
+                           total_hosts_up, total_hosts_down, total_hosts_unreachable);
         }
 
         return return_code;
 }
 
-
-
-int process_arguments(int argc, char **argv){
+int process_arguments(int argc, char **argv) {
         int c;
         char *ptr;
-        int option=0;
-        static struct option longopts[]={
-                {"data",     required_argument,0,'d'},
-                {"warning",  required_argument,0,'w'},
-                {"critical", required_argument,0,'c'},
-                {"label",    required_argument,0,'l'},
-                {"host",     no_argument,      0,'h'},
-                {"service",  no_argument,      0,'s'},
-                {"verbose",  no_argument,      0,'v'},
-                {"version",  no_argument,      0,'V'},
-                {"help",     no_argument,      0,'H'},
-                {0,0,0,0}
-        };
+        int option = 0;
+        static struct option longopts[] = {{"data", required_argument, 0, 'd'},     {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'}, {"label", required_argument, 0, 'l'},
+                                                                           {"host", no_argument, 0, 'h'},           {"service", no_argument, 0, 's'},
+                                                                           {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'H'},           {0, 0, 0, 0}};
 
         /* no options were supplied */
-        if(argc<2)
+        if (argc < 2)
                 return ERROR;
 
-        while(1){
+        while (1) {
 
-                c=getopt_long(argc,argv,"hHsvVw:c:d:l:",longopts,&option);
+                c = getopt_long(argc, argv, "hHsvVw:c:d:l:", longopts, &option);
 
-                if(c==-1 || c==EOF || c==1)
+                if (c == -1 || c == EOF || c == 1)
                         break;
 
-                switch(c){
+                switch (c) {
 
                 case 'h': /* host cluster */
-                        check_type=CHECK_HOSTS;
+                        check_type = CHECK_HOSTS;
                         break;
 
                 case 's': /* service cluster */
-                        check_type=CHECK_SERVICES;
+                        check_type = CHECK_SERVICES;
                         break;
 
                 case 'w': /* warning threshold */
@@ -188,20 +174,20 @@ int process_arguments(int argc, char **argv){
                         break;
 
                 case 'd': /* data values */
-                        data_vals=(char *)strdup(optarg);
+                        data_vals = (char *)strdup(optarg);
                         /* validate data */
-                        for (ptr=data_vals;ptr!=NULL;ptr+=2){
-                                if (ptr[0]<'0' || ptr[0]>'3')
+                        for (ptr = data_vals; ptr != NULL; ptr += 2) {
+                                if (ptr[0] < '0' || ptr[0] > '3')
                                         return ERROR;
-                                if (ptr[1]=='\0')
+                                if (ptr[1] == '\0')
                                         break;
-                                if (ptr[1]!=',')
+                                if (ptr[1] != ',')
                                         return ERROR;
                         }
                         break;
 
                 case 'l': /* text label */
-                        label=(char *)strdup(optarg);
+                        label = (char *)strdup(optarg);
                         break;
 
                 case 'v': /* verbose */
@@ -209,8 +195,8 @@ int process_arguments(int argc, char **argv){
                         break;
 
                 case 'V': /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
                         break;
 
                 case 'H': /* help */
@@ -221,20 +207,18 @@ int process_arguments(int argc, char **argv){
                 default:
                         return ERROR;
                         break;
-                }
+                }
         }
 
-        if(data_vals==NULL)
+        if (data_vals == NULL)
                 return ERROR;
 
         return OK;
 }
 
-void
-print_help(void)
-{
+void print_help(void) {
         print_revision(progname, NP_VERSION);
-        printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
+        printf("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
         printf(COPYRIGHT, copyright, email);
 
         printf(_("Host/Service Cluster Plugin for Monitoring"));
@@ -245,21 +229,21 @@ print_help(void)
         printf("\n");
         printf("%s\n", _("Options:"));
         printf(UT_EXTRA_OPTS);
-        printf (" %s\n", "-s, --service");
-        printf ("    %s\n", _("Check service cluster status"));
-        printf (" %s\n", "-h, --host");
-        printf ("    %s\n", _("Check host cluster status"));
-        printf (" %s\n", "-l, --label=STRING");
-        printf ("    %s\n", _("Optional prepended text output (i.e. \"Host cluster\")"));
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
-        printf ("    %s\n", _("non-OK state in order to return a WARNING status level"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
-        printf ("    %s\n", _("non-OK state in order to return a CRITICAL status level"));
-        printf (" %s\n", "-d, --data=LIST");
-        printf ("    %s\n", _("The status codes of the hosts or services in the cluster, separated by"));
-        printf ("    %s\n", _("commas"));
+        printf(" %s\n", "-s, --service");
+        printf("    %s\n", _("Check service cluster status"));
+        printf(" %s\n", "-h, --host");
+        printf("    %s\n", _("Check host cluster status"));
+        printf(" %s\n", "-l, --label=STRING");
+        printf("    %s\n", _("Optional prepended text output (i.e. \"Host cluster\")"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
+        printf("    %s\n", _("non-OK state in order to return a WARNING status level"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
+        printf("    %s\n", _("non-OK state in order to return a CRITICAL status level"));
+        printf(" %s\n", "-d, --data=LIST");
+        printf("    %s\n", _("The status codes of the hosts or services in the cluster, separated by"));
+        printf("    %s\n", _("commas"));
 
         printf(UT_VERBOSE);
 
@@ -267,23 +251,18 @@ print_help(void)
         printf("%s\n", _("Notes:"));
         printf(UT_THRESHOLDS_NOTES);
 
-        printf ("\n");
-        printf ("%s\n", _("Examples:"));
-        printf (" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:");
-        printf ("    %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK") );
-        printf ("    %s\n", _("state.") );
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:");
+        printf("    %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK"));
+        printf("    %s\n", _("state."));
 
         printf(UT_SUPPORT);
 }
 
-
-void
-print_usage(void)
-{
+void print_usage(void) {
 
         printf("%s\n", _("Usage:"));
         printf(" %s (-s | -h) -d val1[,val2,...,valn] [-l label]\n", progname);
         printf("[-w threshold] [-c threshold] [-v] [--help]\n");
-
 }
-
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index d3bddac..1d27da2 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -1,40 +1,40 @@
 /*****************************************************************************
-*
-* Monitoring check_curl plugin
-*
-* License: GPL
-* Copyright (c) 1999-2019 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_curl plugin
-*
-* This plugin tests the HTTP service on the specified host. It can test
-* normal (http) and secure (https) servers, follow redirects, search for
-* strings and regular expressions, check connection times, and report on
-* certificate expiration times.
-*
-* This plugin uses functions from the curl library, see
-* http://curl.haxx.se
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_curl plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_curl plugin
+ *
+ * This plugin tests the HTTP service on the specified host. It can test
+ * normal (http) and secure (https) servers, follow redirects, search for
+ * strings and regular expressions, check connection times, and report on
+ * certificate expiration times.
+ *
+ * This plugin uses functions from the curl library, see
+ * http://curl.haxx.se
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 const char *progname = "check_curl";
 
-const char *copyright = "2006-2019";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include <stdbool.h>
@@ -44,7 +44,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 
 #ifndef LIBCURL_PROTOCOL_HTTP
-#error libcurl compiled without HTTP support, compiling check_curl plugin does not makes a lot of sense
+#       error libcurl compiled without HTTP support, compiling check_curl plugin does not makes a lot of sense
 #endif
 
 #include "curl/curl.h"
@@ -58,7 +58,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include <netinet/in.h>
 
 #if defined(HAVE_SSL) && defined(USE_OPENSSL)
-#include <openssl/opensslv.h>
+#       include <openssl/opensslv.h>
 #endif
 
 #include <netdb.h>
@@ -66,1107 +66,1049 @@ const char *email = "devel@monitoring-plugins.org";
 #define MAKE_LIBCURL_VERSION(major, minor, patch) ((major)*0x10000 + (minor)*0x100 + (patch))
 
 #define DEFAULT_BUFFER_SIZE 2048
-#define DEFAULT_SERVER_URL "/"
-#define HTTP_EXPECT "HTTP/"
-#define INET_ADDR_MAX_SIZE INET6_ADDRSTRLEN
+#define DEFAULT_SERVER_URL  "/"
+#define HTTP_EXPECT         "HTTP/"
+#define INET_ADDR_MAX_SIZE  INET6_ADDRSTRLEN
 enum {
-  MAX_IPV4_HOSTLENGTH = 255,
-  HTTP_PORT = 80,
-  HTTPS_PORT = 443,
-  MAX_PORT = 65535,
-  DEFAULT_MAX_REDIRS = 15
+        MAX_IPV4_HOSTLENGTH = 255,
+        HTTP_PORT = 80,
+        HTTPS_PORT = 443,
+        MAX_PORT = 65535,
+        DEFAULT_MAX_REDIRS = 15
 };
 
 enum {
-  STICKY_NONE = 0,
-  STICKY_HOST = 1,
-  STICKY_PORT = 2
+        STICKY_NONE = 0,
+        STICKY_HOST = 1,
+        STICKY_PORT = 2
 };
 
 enum {
-  FOLLOW_HTTP_CURL = 0,
-  FOLLOW_LIBCURL = 1
+        FOLLOW_HTTP_CURL = 0,
+        FOLLOW_LIBCURL = 1
 };
 
 /* for buffers for header and body */
 typedef struct {
-  char *buf;
-  size_t buflen;
-  size_t bufsize;
+        char *buf;
+        size_t buflen;
+        size_t bufsize;
 } curlhelp_write_curlbuf;
 
 /* for buffering the data sent in PUT */
 typedef struct {
-  char *buf;
-  size_t buflen;
-  off_t pos;
+        char *buf;
+        size_t buflen;
+        off_t pos;
 } curlhelp_read_curlbuf;
 
 /* for parsing the HTTP status line */
 typedef struct {
-  int http_major;   /* major version of the protocol, always 1 (HTTP/0.9
-                     * never reached the big internet most likely) */
-  int http_minor;   /* minor version of the protocol, usually 0 or 1 */
-  int http_code;    /* HTTP return code as in RFC 2145 */
-  int http_subcode; /* Microsoft IIS extension, HTTP subcodes, see
-                     * http://support.microsoft.com/kb/318380/en-us */
-  const char *msg;  /* the human readable message */
-  char *first_line; /* a copy of the first line */
+        int http_major;   /* major version of the protocol, always 1 (HTTP/0.9
+                                           * never reached the big internet most likely) */
+        int http_minor;   /* minor version of the protocol, usually 0 or 1 */
+        int http_code;    /* HTTP return code as in RFC 2145 */
+        int http_subcode; /* Microsoft IIS extension, HTTP subcodes, see
+                                           * http://support.microsoft.com/kb/318380/en-us */
+        const char *msg;  /* the human readable message */
+        char *first_line; /* a copy of the first line */
 } curlhelp_statusline;
 
 /* to know the underlying SSL library used by libcurl */
 typedef enum curlhelp_ssl_library {
-  CURLHELP_SSL_LIBRARY_UNKNOWN,
-  CURLHELP_SSL_LIBRARY_OPENSSL,
-  CURLHELP_SSL_LIBRARY_LIBRESSL,
-  CURLHELP_SSL_LIBRARY_GNUTLS,
-  CURLHELP_SSL_LIBRARY_NSS
+        CURLHELP_SSL_LIBRARY_UNKNOWN,
+        CURLHELP_SSL_LIBRARY_OPENSSL,
+        CURLHELP_SSL_LIBRARY_LIBRESSL,
+        CURLHELP_SSL_LIBRARY_GNUTLS,
+        CURLHELP_SSL_LIBRARY_NSS
 } curlhelp_ssl_library;
 
 enum {
-  REGS = 2,
-  MAX_RE_SIZE = 1024
+        REGS = 2,
+        MAX_RE_SIZE = 1024
 };
 #include "regex.h"
-regex_t preg;
-regmatch_t pmatch[REGS];
-char regexp[MAX_RE_SIZE];
-int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
-int errcode;
-bool invert_regex = false;
-int state_regex = STATE_CRITICAL;
-
-char *server_address = NULL;
-char *host_name = NULL;
-char *server_url = 0;
-char server_ip[DEFAULT_BUFFER_SIZE];
-struct curl_slist *server_ips = NULL;
-bool specify_port = false;
-unsigned short server_port = HTTP_PORT;
-unsigned short virtual_port = 0;
-int host_name_length;
-char output_header_search[30] = "";
-char output_string_search[30] = "";
-char *warning_thresholds = NULL;
-char *critical_thresholds = NULL;
-int days_till_exp_warn, days_till_exp_crit;
-thresholds *thlds;
-char user_agent[DEFAULT_BUFFER_SIZE];
-int verbose = 0;
-bool show_extended_perfdata = false;
-bool show_body = false;
-int min_page_len = 0;
-int max_page_len = 0;
-int redir_depth = 0;
-int max_depth = DEFAULT_MAX_REDIRS;
-char *http_method = NULL;
-char *http_post_data = NULL;
-char *http_content_type = NULL;
-CURL *curl;
-bool curl_global_initialized = false;
-bool curl_easy_initialized = false;
-struct curl_slist *header_list = NULL;
-bool body_buf_initialized = false;
-curlhelp_write_curlbuf body_buf;
-bool header_buf_initialized = false;
-curlhelp_write_curlbuf header_buf;
-bool status_line_initialized = false;
-curlhelp_statusline status_line;
-bool put_buf_initialized = false;
-curlhelp_read_curlbuf put_buf;
-char http_header[DEFAULT_BUFFER_SIZE];
-long code;
-long socket_timeout = DEFAULT_SOCKET_TIMEOUT;
-double total_time;
-double time_connect;
-double time_appconnect;
-double time_headers;
-double time_firstbyte;
-char errbuf[MAX_INPUT_BUFFER];
-CURLcode res;
-char url[DEFAULT_BUFFER_SIZE];
-char msg[DEFAULT_BUFFER_SIZE];
-char perfstring[DEFAULT_BUFFER_SIZE];
-char header_expect[MAX_INPUT_BUFFER] = "";
-char string_expect[MAX_INPUT_BUFFER] = "";
-char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
-int server_expect_yn = 0;
-char user_auth[MAX_INPUT_BUFFER] = "";
-char proxy_auth[MAX_INPUT_BUFFER] = "";
-char **http_opt_headers;
-int http_opt_headers_count = 0;
-bool display_html = false;
-int onredirect = STATE_OK;
-int followmethod = FOLLOW_HTTP_CURL;
-int followsticky = STICKY_NONE;
-bool use_ssl = false;
-bool use_sni = true;
-bool check_cert = false;
-bool continue_after_check_cert = false;
+static regex_t preg;
+static regmatch_t pmatch[REGS];
+static char regexp[MAX_RE_SIZE];
+static int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
+static int errcode;
+static bool invert_regex = false;
+static int state_regex = STATE_CRITICAL;
+
+static char *server_address = NULL;
+static char *host_name = NULL;
+static char *server_url = 0;
+static struct curl_slist *server_ips = NULL;
+static bool specify_port = false;
+static unsigned short server_port = HTTP_PORT;
+static unsigned short virtual_port = 0;
+static int host_name_length;
+static char output_header_search[30] = "";
+static char output_string_search[30] = "";
+static char *warning_thresholds = NULL;
+static char *critical_thresholds = NULL;
+static int days_till_exp_warn, days_till_exp_crit;
+static thresholds *thlds;
+static char user_agent[DEFAULT_BUFFER_SIZE];
+static int verbose = 0;
+static bool show_extended_perfdata = false;
+static bool show_body = false;
+static int min_page_len = 0;
+static int max_page_len = 0;
+static int redir_depth = 0;
+static int max_depth = DEFAULT_MAX_REDIRS;
+static char *http_method = NULL;
+static char *http_post_data = NULL;
+static char *http_content_type = NULL;
+static CURL *curl;
+static bool curl_global_initialized = false;
+static bool curl_easy_initialized = false;
+static struct curl_slist *header_list = NULL;
+static bool body_buf_initialized = false;
+static curlhelp_write_curlbuf body_buf;
+static bool header_buf_initialized = false;
+static curlhelp_write_curlbuf header_buf;
+static bool status_line_initialized = false;
+static curlhelp_statusline status_line;
+static bool put_buf_initialized = false;
+static curlhelp_read_curlbuf put_buf;
+static char http_header[DEFAULT_BUFFER_SIZE];
+static long code;
+static long socket_timeout = DEFAULT_SOCKET_TIMEOUT;
+static double total_time;
+static double time_connect;
+static double time_appconnect;
+static double time_headers;
+static double time_firstbyte;
+static char errbuf[MAX_INPUT_BUFFER];
+static CURLcode res;
+static char url[DEFAULT_BUFFER_SIZE];
+static char msg[DEFAULT_BUFFER_SIZE];
+static char perfstring[DEFAULT_BUFFER_SIZE];
+static char header_expect[MAX_INPUT_BUFFER] = "";
+static char string_expect[MAX_INPUT_BUFFER] = "";
+static char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+static int server_expect_yn = 0;
+static char user_auth[MAX_INPUT_BUFFER] = "";
+static char proxy_auth[MAX_INPUT_BUFFER] = "";
+static char **http_opt_headers;
+static int http_opt_headers_count = 0;
+static bool display_html = false;
+static int onredirect = STATE_OK;
+static int followmethod = FOLLOW_HTTP_CURL;
+static int followsticky = STICKY_NONE;
+static bool use_ssl = false;
+static bool check_cert = false;
+static bool continue_after_check_cert = false;
 typedef union {
-  struct curl_slist* to_info;
-  struct curl_certinfo* to_certinfo;
+        struct curl_slist *to_info;
+        struct curl_certinfo *to_certinfo;
 } cert_ptr_union;
-cert_ptr_union cert_ptr;
-int ssl_version = CURL_SSLVERSION_DEFAULT;
-char *client_cert = NULL;
-char *client_privkey = NULL;
-char *ca_cert = NULL;
-bool verify_peer_and_host = false;
-bool is_openssl_callback = false;
-bool add_sslctx_verify_fun = false;
+static cert_ptr_union cert_ptr;
+static int ssl_version = CURL_SSLVERSION_DEFAULT;
+static char *client_cert = NULL;
+static char *client_privkey = NULL;
+static char *ca_cert = NULL;
+static bool verify_peer_and_host = false;
+static bool is_openssl_callback = false;
+static bool add_sslctx_verify_fun = false;
 #if defined(HAVE_SSL) && defined(USE_OPENSSL)
-X509 *cert = NULL;
+static X509 *cert = NULL;
 #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
-bool no_body = false;
-int maximum_age = -1;
-int address_family = AF_UNSPEC;
-curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
-int curl_http_version = CURL_HTTP_VERSION_NONE;
-bool automatic_decompression = false;
-char *cookie_jar_file = NULL;
-bool haproxy_protocol = false;
-
-bool process_arguments (int, char**);
-void handle_curl_option_return_code (CURLcode res, const char* option);
-int check_http (void);
-void redir (curlhelp_write_curlbuf*);
-char *perfd_time (double microsec);
-char *perfd_time_connect (double microsec);
-char *perfd_time_ssl (double microsec);
-char *perfd_time_firstbyte (double microsec);
-char *perfd_time_headers (double microsec);
-char *perfd_time_transfer (double microsec);
-char *perfd_size (int page_len);
-void print_help (void);
-void print_usage (void);
-void print_curl_version (void);
-int curlhelp_initwritebuffer (curlhelp_write_curlbuf*);
-size_t curlhelp_buffer_write_callback(void*, size_t , size_t , void*);
-void curlhelp_freewritebuffer (curlhelp_write_curlbuf*);
-int curlhelp_initreadbuffer (curlhelp_read_curlbuf *, const char *, size_t);
-size_t curlhelp_buffer_read_callback(void *, size_t , size_t , void *);
-void curlhelp_freereadbuffer (curlhelp_read_curlbuf *);
-curlhelp_ssl_library curlhelp_get_ssl_library ();
-const char* curlhelp_get_ssl_library_string (curlhelp_ssl_library);
-int net_noopenssl_check_certificate (cert_ptr_union*, int, int);
-
-int curlhelp_parse_statusline (const char*, curlhelp_statusline *);
-void curlhelp_free_statusline (curlhelp_statusline *);
-char *get_header_value (const struct phr_header* headers, const size_t nof_headers, const char* header);
-int check_document_dates (const curlhelp_write_curlbuf *, char (*msg)[DEFAULT_BUFFER_SIZE]);
-int get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_write_curlbuf* body_buf);
+static bool no_body = false;
+static int maximum_age = -1;
+static int address_family = AF_UNSPEC;
+static curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
+static int curl_http_version = CURL_HTTP_VERSION_NONE;
+static bool automatic_decompression = false;
+static char *cookie_jar_file = NULL;
+static bool haproxy_protocol = false;
+
+static bool process_arguments(int /*argc*/, char ** /*argv*/);
+static void handle_curl_option_return_code(CURLcode res, const char *option);
+static int check_http(void);
+static void redir(curlhelp_write_curlbuf * /*header_buf*/);
+static char *perfd_time(double elapsed_time);
+static char *perfd_time_connect(double elapsed_time_connect);
+static char *perfd_time_ssl(double elapsed_time_ssl);
+static char *perfd_time_firstbyte(double elapsed_time_firstbyte);
+static char *perfd_time_headers(double elapsed_time_headers);
+static char *perfd_time_transfer(double elapsed_time_transfer);
+static char *perfd_size(int page_len);
+static void print_help(void);
+void print_usage(void);
+static void print_curl_version(void);
+static int curlhelp_initwritebuffer(curlhelp_write_curlbuf * /*buf*/);
+static size_t curlhelp_buffer_write_callback(void * /*buffer*/, size_t /*size*/, size_t /*nmemb*/, void * /*stream*/);
+static void curlhelp_freewritebuffer(curlhelp_write_curlbuf * /*buf*/);
+static int curlhelp_initreadbuffer(curlhelp_read_curlbuf * /*buf*/, const char * /*data*/, size_t /*datalen*/);
+static size_t curlhelp_buffer_read_callback(void * /*buffer*/, size_t /*size*/, size_t /*nmemb*/, void * /*stream*/);
+static void curlhelp_freereadbuffer(curlhelp_read_curlbuf * /*buf*/);
+static curlhelp_ssl_library curlhelp_get_ssl_library(void);
+static const char *curlhelp_get_ssl_library_string(curlhelp_ssl_library /*ssl_library*/);
+int net_noopenssl_check_certificate(cert_ptr_union *, int, int);
+
+static int curlhelp_parse_statusline(const char * /*buf*/, curlhelp_statusline * /*status_line*/);
+static void curlhelp_free_statusline(curlhelp_statusline * /*status_line*/);
+static char *get_header_value(const struct phr_header *headers, size_t nof_headers, const char *header);
+static int check_document_dates(const curlhelp_write_curlbuf * /*header_buf*/, char (*msg)[DEFAULT_BUFFER_SIZE]);
+static int get_content_length(const curlhelp_write_curlbuf *header_buf, const curlhelp_write_curlbuf *body_buf);
 
 #if defined(HAVE_SSL) && defined(USE_OPENSSL)
 int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int days_till_exp_crit);
 #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
 
-void remove_newlines (char *);
-void test_file (char *);
+static void test_file(char * /*path*/);
 
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
+int main(int argc, char **argv) {
+        int result = STATE_UNKNOWN;
 
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-  /* Parse extra opts if any */
-  argv = np_extra_opts (&argc, argv, progname);
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
 
-  /* set defaults */
-  snprintf( user_agent, DEFAULT_BUFFER_SIZE, "%s/v%s (monitoring-plugins %s, %s)",
-    progname, NP_VERSION, VERSION, curl_version());
+        /* set defaults */
+        snprintf(user_agent, DEFAULT_BUFFER_SIZE, "%s/v%s (monitoring-plugins %s, %s)", progname, NP_VERSION, VERSION, curl_version());
 
-  /* parse arguments */
-  if (process_arguments (argc, argv) == false)
-    usage4 (_("Could not parse arguments"));
+        /* parse arguments */
+        if (process_arguments(argc, argv) == false)
+                usage4(_("Could not parse arguments"));
 
-  if (display_html)
-    printf ("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">",
-      use_ssl ? "https" : "http",
-      host_name ? host_name : server_address,
-      virtual_port ? virtual_port : server_port,
-      server_url);
+        if (display_html)
+                printf("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">", use_ssl ? "https" : "http", host_name ? host_name : server_address,
+                           virtual_port ? virtual_port : server_port, server_url);
 
-  result = check_http ();
-  return result;
+        result = check_http();
+        return result;
 }
 
 #ifdef HAVE_SSL
-#ifdef USE_OPENSSL
-
-int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
-{
-  (void) preverify_ok;
-  /* TODO: we get all certificates of the chain, so which ones
-   * should we test?
-   * TODO: is the last certificate always the server certificate?
-   */
-  cert = X509_STORE_CTX_get_current_cert(x509_ctx);
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-  X509_up_ref(cert);
-#endif
-  if (verbose>=2) {
-    puts("* SSL verify callback with certificate:");
-    X509_NAME *subject, *issuer;
-    printf("*   issuer:\n");
-    issuer = X509_get_issuer_name( cert );
-    X509_NAME_print_ex_fp(stdout, issuer, 5, XN_FLAG_MULTILINE);
-    printf("* curl verify_callback:\n*   subject:\n");
-    subject = X509_get_subject_name( cert );
-    X509_NAME_print_ex_fp(stdout, subject, 5, XN_FLAG_MULTILINE);
-    puts("");
-  }
-  return 1;
+#       ifdef USE_OPENSSL
+
+int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) {
+        (void)preverify_ok;
+        /* TODO: we get all certificates of the chain, so which ones
+         * should we test?
+         * TODO: is the last certificate always the server certificate?
+         */
+        cert = X509_STORE_CTX_get_current_cert(x509_ctx);
+#               if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        X509_up_ref(cert);
+#               endif
+        if (verbose >= 2) {
+                puts("* SSL verify callback with certificate:");
+                X509_NAME *subject;
+                X509_NAME *issuer;
+                printf("*   issuer:\n");
+                issuer = X509_get_issuer_name(cert);
+                X509_NAME_print_ex_fp(stdout, issuer, 5, XN_FLAG_MULTILINE);
+                printf("* curl verify_callback:\n*   subject:\n");
+                subject = X509_get_subject_name(cert);
+                X509_NAME_print_ex_fp(stdout, subject, 5, XN_FLAG_MULTILINE);
+                puts("");
+        }
+        return 1;
 }
 
-CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm)
-{
-  (void) curl; // ignore unused parameter
-  (void) parm; // ignore unused parameter
-  if(add_sslctx_verify_fun) {
-    SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback);
-  }
-
-  // workaround for issue:
-  // OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0
-  // see discussion https://github.com/openssl/openssl/discussions/22690
-#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
-  SSL_CTX_set_options(sslctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
-#endif
+CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm) {
+        (void)curl; // ignore unused parameter
+        (void)parm; // ignore unused parameter
+        if (add_sslctx_verify_fun) {
+                SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback);
+        }
+
+        // workaround for issue:
+        // OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0
+        // see discussion https://github.com/openssl/openssl/discussions/22690
+#               ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
+        SSL_CTX_set_options(sslctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
+#               endif
 
-  return CURLE_OK;
+        return CURLE_OK;
 }
 
-#endif /* USE_OPENSSL */
-#endif /* HAVE_SSL */
+#       endif /* USE_OPENSSL */
+#endif     /* HAVE_SSL */
 
 /* returns a string "HTTP/1.x" or "HTTP/2" */
-static char *string_statuscode (int major, int minor)
-{
-  static char buf[10];
-
-  switch (major) {
-    case 1:
-      snprintf (buf, sizeof (buf), "HTTP/%d.%d", major, minor);
-      break;
-    case 2:
-    case 3:
-      snprintf (buf, sizeof (buf), "HTTP/%d", major);
-      break;
-    default:
-      /* assuming here HTTP/N with N>=4 */
-      snprintf (buf, sizeof (buf), "HTTP/%d", major);
-      break;
-  }
-
-  return buf;
+static char *string_statuscode(int major, int minor) {
+        static char buf[10];
+
+        switch (major) {
+        case 1:
+                snprintf(buf, sizeof(buf), "HTTP/%d.%d", major, minor);
+                break;
+        case 2:
+        case 3:
+                snprintf(buf, sizeof(buf), "HTTP/%d", major);
+                break;
+        default:
+                /* assuming here HTTP/N with N>=4 */
+                snprintf(buf, sizeof(buf), "HTTP/%d", major);
+                break;
+        }
+
+        return buf;
 }
 
 /* Checks if the server 'reply' is one of the expected 'statuscodes' */
-static int
-expected_statuscode (const char *reply, const char *statuscodes)
-{
-  char *expected, *code;
-  int result = 0;
-
-  if ((expected = strdup (statuscodes)) == NULL)
-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
-
-  for (code = strtok (expected, ","); code != NULL; code = strtok (NULL, ","))
-    if (strstr (reply, code) != NULL) {
-      result = 1;
-      break;
-    }
-
-  free (expected);
-  return result;
+static int expected_statuscode(const char *reply, const char *statuscodes) {
+        char *expected;
+        char *code;
+        int result = 0;
+
+        if ((expected = strdup(statuscodes)) == NULL)
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+
+        for (code = strtok(expected, ","); code != NULL; code = strtok(NULL, ","))
+                if (strstr(reply, code) != NULL) {
+                        result = 1;
+                        break;
+                }
+
+        free(expected);
+        return result;
 }
 
-void
-handle_curl_option_return_code (CURLcode res, const char* option)
-{
-  if (res != CURLE_OK) {
-                snprintf (msg,
-                        DEFAULT_BUFFER_SIZE,
-                        _("Error while setting cURL option '%s': cURL returned %d - %s"),
-                        option,
-                        res,
-                        curl_easy_strerror(res));
-    die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-  }
+void handle_curl_option_return_code(CURLcode res, const char *option) {
+        if (res != CURLE_OK) {
+                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Error while setting cURL option '%s': cURL returned %d - %s"), option, res,
+                                 curl_easy_strerror(res));
+                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
+        }
 }
 
-int
-lookup_host (const char *host, char *buf, size_t buflen)
-{
-  struct addrinfo hints, *res, *result;
-  char addrstr[100];
-  size_t addrstr_len;
-  int errcode;
-  void *ptr = { 0 };
-  size_t buflen_remaining = buflen - 1;
-
-  memset (&hints, 0, sizeof (hints));
-  hints.ai_family = address_family;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags |= AI_CANONNAME;
-
-  errcode = getaddrinfo (host, NULL, &hints, &result);
-  if (errcode != 0)
-    return errcode;
-
-  strcpy(buf, "");
-  res = result;
-
-  while (res) {
-    switch (res->ai_family) {
-      case AF_INET:
-        ptr = &((struct sockaddr_in *) res->ai_addr)->sin_addr;
-        break;
-      case AF_INET6:
-        ptr = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr;
-        break;
-    }
-
-    inet_ntop (res->ai_family, ptr, addrstr, 100);
-    if (verbose >= 1) {
-      printf ("* getaddrinfo IPv%d address: %s\n",
-        res->ai_family == PF_INET6 ? 6 : 4, addrstr);
-    }
-
-    // Append all IPs to buf as a comma-separated string
-    addrstr_len = strlen(addrstr);
-    if (buflen_remaining > addrstr_len + 1) {
-      if (buf[0] != '\0') {
-        strncat(buf, ",", buflen_remaining);
-        buflen_remaining -= 1;
-      }
-      strncat(buf, addrstr, buflen_remaining);
-      buflen_remaining -= addrstr_len;
-    }
-
-    res = res->ai_next;
-  }
-
-  freeaddrinfo(result);
-
-  return 0;
+int lookup_host(const char *host, char *buf, size_t buflen) {
+        struct addrinfo hints, *res, *result;
+        char addrstr[100];
+        size_t addrstr_len;
+        int errcode;
+        void *ptr = {0};
+        size_t buflen_remaining = buflen - 1;
+
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = address_family;
+        hints.ai_socktype = SOCK_STREAM;
+        hints.ai_flags |= AI_CANONNAME;
+
+        errcode = getaddrinfo(host, NULL, &hints, &result);
+        if (errcode != 0)
+                return errcode;
+
+        strcpy(buf, "");
+        res = result;
+
+        while (res) {
+                switch (res->ai_family) {
+                case AF_INET:
+                        ptr = &((struct sockaddr_in *)res->ai_addr)->sin_addr;
+                        break;
+                case AF_INET6:
+                        ptr = &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+                        break;
+                }
+
+                inet_ntop(res->ai_family, ptr, addrstr, 100);
+                if (verbose >= 1) {
+                        printf("* getaddrinfo IPv%d address: %s\n", res->ai_family == PF_INET6 ? 6 : 4, addrstr);
+                }
+
+                // Append all IPs to buf as a comma-separated string
+                addrstr_len = strlen(addrstr);
+                if (buflen_remaining > addrstr_len + 1) {
+                        if (buf[0] != '\0') {
+                                strncat(buf, ",", buflen_remaining);
+                                buflen_remaining -= 1;
+                        }
+                        strncat(buf, addrstr, buflen_remaining);
+                        buflen_remaining -= addrstr_len;
+                }
+
+                res = res->ai_next;
+        }
+
+        freeaddrinfo(result);
+
+        return 0;
 }
 
-static void
-cleanup (void)
-{
-  if (status_line_initialized) curlhelp_free_statusline(&status_line);
-  status_line_initialized = false;
-  if (curl_easy_initialized) curl_easy_cleanup (curl);
-  curl_easy_initialized = false;
-  if (curl_global_initialized) curl_global_cleanup ();
-  curl_global_initialized = false;
-  if (body_buf_initialized) curlhelp_freewritebuffer (&body_buf);
-  body_buf_initialized = false;
-  if (header_buf_initialized) curlhelp_freewritebuffer (&header_buf);
-  header_buf_initialized = false;
-  if (put_buf_initialized) curlhelp_freereadbuffer (&put_buf);
-  put_buf_initialized = false;
+static void cleanup(void) {
+        if (status_line_initialized)
+                curlhelp_free_statusline(&status_line);
+        status_line_initialized = false;
+        if (curl_easy_initialized)
+                curl_easy_cleanup(curl);
+        curl_easy_initialized = false;
+        if (curl_global_initialized)
+                curl_global_cleanup();
+        curl_global_initialized = false;
+        if (body_buf_initialized)
+                curlhelp_freewritebuffer(&body_buf);
+        body_buf_initialized = false;
+        if (header_buf_initialized)
+                curlhelp_freewritebuffer(&header_buf);
+        header_buf_initialized = false;
+        if (put_buf_initialized)
+                curlhelp_freereadbuffer(&put_buf);
+        put_buf_initialized = false;
 }
 
-int
-check_http (void)
-{
-  int result = STATE_OK;
-  int result_ssl = STATE_OK;
-  int page_len = 0;
-  int i;
-  char *force_host_header = NULL;
-  struct curl_slist *host = NULL;
-  char addrstr[DEFAULT_BUFFER_SIZE/2];
-  char dnscache[DEFAULT_BUFFER_SIZE];
-
-  /* initialize curl */
-  if (curl_global_init (CURL_GLOBAL_DEFAULT) != CURLE_OK)
-    die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
-  curl_global_initialized = true;
-
-  if ((curl = curl_easy_init()) == NULL) {
-    die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
-  }
-  curl_easy_initialized = true;
-
-  /* register cleanup function to shut down libcurl properly */
-  atexit (cleanup);
-
-  if (verbose >= 1)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_VERBOSE, 1), "CURLOPT_VERBOSE");
-
-  /* print everything on stdout like check_http would do */
-  handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_STDERR, stdout), "CURLOPT_STDERR");
-
-  if (automatic_decompression)
+int check_http(void) {
+        int result = STATE_OK;
+        int result_ssl = STATE_OK;
+        int page_len = 0;
+        int i;
+        char *force_host_header = NULL;
+        struct curl_slist *host = NULL;
+        char addrstr[DEFAULT_BUFFER_SIZE / 2];
+        char dnscache[DEFAULT_BUFFER_SIZE];
+
+        /* initialize curl */
+        if (curl_global_init(CURL_GLOBAL_DEFAULT) != CURLE_OK)
+                die(STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
+        curl_global_initialized = true;
+
+        if ((curl = curl_easy_init()) == NULL) {
+                die(STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
+        }
+        curl_easy_initialized = true;
+
+        /* register cleanup function to shut down libcurl properly */
+        atexit(cleanup);
+
+        if (verbose >= 1)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_VERBOSE, 1), "CURLOPT_VERBOSE");
+
+        /* print everything on stdout like check_http would do */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_STDERR, stdout), "CURLOPT_STDERR");
+
+        if (automatic_decompression)
 #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6)
-    handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, ""), "CURLOPT_ACCEPT_ENCODING");
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, ""), "CURLOPT_ACCEPT_ENCODING");
 #else
-    handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_ENCODING, ""), "CURLOPT_ENCODING");
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_ENCODING, ""), "CURLOPT_ENCODING");
 #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6) */
 
-  /* initialize buffer for body of the answer */
-  if (curlhelp_initwritebuffer(&body_buf) < 0)
-    die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n");
-  body_buf_initialized = true;
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback), "CURLOPT_WRITEFUNCTION");
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEDATA, (void *)&body_buf), "CURLOPT_WRITEDATA");
-
-  /* initialize buffer for header of the answer */
-  if (curlhelp_initwritebuffer( &header_buf ) < 0)
-    die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for header\n" );
-  header_buf_initialized = true;
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback), "CURLOPT_HEADERFUNCTION");
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEHEADER, (void *)&header_buf), "CURLOPT_WRITEHEADER");
-
-  /* set the error buffer */
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, errbuf), "CURLOPT_ERRORBUFFER");
-
-  /* set timeouts */
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT");
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT");
-
-  /* enable haproxy protocol */
-  if (haproxy_protocol) {
-    handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL");
-  }
-
-  // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy
-  if(use_ssl && host_name != NULL) {
-      if ( (res=lookup_host (server_address, addrstr, DEFAULT_BUFFER_SIZE/2)) != 0) {
-                                snprintf (msg,
-                                        DEFAULT_BUFFER_SIZE,
-                                        _("Unable to lookup IP address for '%s': getaddrinfo returned %d - %s"),
-                                        server_address,
-                                        res,
-                                        gai_strerror (res));
-                                die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-      }
-      snprintf (dnscache, DEFAULT_BUFFER_SIZE, "%s:%d:%s", host_name, server_port, addrstr);
-      host = curl_slist_append(NULL, dnscache);
-      curl_easy_setopt(curl, CURLOPT_RESOLVE, host);
-      if (verbose>=1)
-        printf ("* curl CURLOPT_RESOLVE: %s\n", dnscache);
-  }
-
-  // If server_address is an IPv6 address it must be surround by square brackets
-  struct in6_addr tmp_in_addr;
-  if (inet_pton(AF_INET6, server_address, &tmp_in_addr) == 1) {
-    char *new_server_address = malloc(strlen(server_address) + 3);
-    if (new_server_address == NULL) {
-      die(STATE_UNKNOWN, "HTTP UNKNOWN - Unable to allocate memory\n");
-    }
-    snprintf(new_server_address, strlen(server_address)+3, "[%s]", server_address);
-    free(server_address);
-    server_address = new_server_address;
-  }
-
-  /* compose URL: use the address we want to connect to, set Host: header later */
-  snprintf (url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s",
-      use_ssl ? "https" : "http",
-      ( use_ssl & ( host_name != NULL ) ) ? host_name : server_address,
-      server_port,
-      server_url
-  );
-
-  if (verbose>=1)
-    printf ("* curl CURLOPT_URL: %s\n", url);
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_URL, url), "CURLOPT_URL");
-
-  /* extract proxy information for legacy proxy https requests */
-  if (!strcmp(http_method, "CONNECT") || strstr(server_url, "http") == server_url) {
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_PROXY, server_address), "CURLOPT_PROXY");
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_PROXYPORT, (long)server_port), "CURLOPT_PROXYPORT");
-    if (verbose>=2)
-      printf ("* curl CURLOPT_PROXY: %s:%d\n", server_address, server_port);
-    http_method = "GET";
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_URL, server_url), "CURLOPT_URL");
-  }
-
-  /* disable body for HEAD request */
-  if (http_method && !strcmp (http_method, "HEAD" )) {
-    no_body = true;
-  }
-
-  /* set HTTP protocol version */
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_HTTP_VERSION, curl_http_version), "CURLOPT_HTTP_VERSION");
-
-  /* set HTTP method */
-  if (http_method) {
-    if (!strcmp(http_method, "POST"))
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_POST, 1), "CURLOPT_POST");
-    else if (!strcmp(http_method, "PUT"))
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_UPLOAD, 1), "CURLOPT_UPLOAD");
-    else
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CUSTOMREQUEST, http_method), "CURLOPT_CUSTOMREQUEST");
-  }
-
-  /* check if Host header is explicitly set in options */
-  if (http_opt_headers_count) {
-    for (i = 0; i < http_opt_headers_count ; i++) {
-      if (strncmp(http_opt_headers[i], "Host:", 5) == 0) {
-        force_host_header = http_opt_headers[i];
-      }
-    }
-  }
-
-  /* set hostname (virtual hosts), not needed if CURLOPT_CONNECT_TO is used, but left in anyway */
-  if(host_name != NULL && force_host_header == NULL) {
-    if((virtual_port != HTTP_PORT && !use_ssl) || (virtual_port != HTTPS_PORT && use_ssl)) {
-      snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s:%d", host_name, virtual_port);
-    } else {
-      snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s", host_name);
-    }
-    header_list = curl_slist_append (header_list, http_header);
-  }
-
-  /* always close connection, be nice to servers */
-  snprintf (http_header, DEFAULT_BUFFER_SIZE, "Connection: close");
-  header_list = curl_slist_append (header_list, http_header);
-
-  /* attach additional headers supplied by the user */
-  /* optionally send any other header tag */
-  if (http_opt_headers_count) {
-    for (i = 0; i < http_opt_headers_count ; i++) {
-      header_list = curl_slist_append (header_list, http_opt_headers[i]);
-    }
-    /* This cannot be free'd here because a redirection will then try to access this and segfault */
-    /* Covered in a testcase in tests/check_http.t */
-    /* free(http_opt_headers); */
-  }
-
-  /* set HTTP headers */
-  handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_HTTPHEADER, header_list ), "CURLOPT_HTTPHEADER");
+        /* initialize buffer for body of the answer */
+        if (curlhelp_initwritebuffer(&body_buf) < 0)
+                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n");
+        body_buf_initialized = true;
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback),
+                                                                   "CURLOPT_WRITEFUNCTION");
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&body_buf), "CURLOPT_WRITEDATA");
+
+        /* initialize buffer for header of the answer */
+        if (curlhelp_initwritebuffer(&header_buf) < 0)
+                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for header\n");
+        header_buf_initialized = true;
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback),
+                                                                   "CURLOPT_HEADERFUNCTION");
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)&header_buf), "CURLOPT_WRITEHEADER");
+
+        /* set the error buffer */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf), "CURLOPT_ERRORBUFFER");
+
+        /* set timeouts */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT");
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT");
+
+        /* enable haproxy protocol */
+        if (haproxy_protocol) {
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL");
+        }
+
+        // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we
+        // use the host_name later on to make SNI happy
+        if (use_ssl && host_name != NULL) {
+                if ((res = lookup_host(server_address, addrstr, DEFAULT_BUFFER_SIZE / 2)) != 0) {
+                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Unable to lookup IP address for '%s': getaddrinfo returned %d - %d"), server_address, res,
+                                         gai_strerror(res));
+                        die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
+                }
+                snprintf(dnscache, DEFAULT_BUFFER_SIZE, "%s:%d:%s", host_name, server_port, addrstr);
+                host = curl_slist_append(NULL, dnscache);
+                curl_easy_setopt(curl, CURLOPT_RESOLVE, host);
+                if (verbose >= 1)
+                        printf("* curl CURLOPT_RESOLVE: %s\n", dnscache);
+        }
+
+        // If server_address is an IPv6 address it must be surround by square brackets
+        struct in6_addr tmp_in_addr;
+        if (inet_pton(AF_INET6, server_address, &tmp_in_addr) == 1) {
+                char *new_server_address = malloc(strlen(server_address) + 3);
+                if (new_server_address == NULL) {
+                        die(STATE_UNKNOWN, "HTTP UNKNOWN - Unable to allocate memory\n");
+                }
+                snprintf(new_server_address, strlen(server_address) + 3, "[%s]", server_address);
+                free(server_address);
+                server_address = new_server_address;
+        }
+
+        /* compose URL: use the address we want to connect to, set Host: header later */
+        snprintf(url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s", use_ssl ? "https" : "http",
+                         (use_ssl & (host_name != NULL)) ? host_name : server_address, server_port, server_url);
+
+        if (verbose >= 1)
+                printf("* curl CURLOPT_URL: %s\n", url);
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_URL, url), "CURLOPT_URL");
+
+        /* extract proxy information for legacy proxy https requests */
+        if (!strcmp(http_method, "CONNECT") || strstr(server_url, "http") == server_url) {
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_PROXY, server_address), "CURLOPT_PROXY");
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_PROXYPORT, (long)server_port), "CURLOPT_PROXYPORT");
+                if (verbose >= 2)
+                        printf("* curl CURLOPT_PROXY: %s:%d\n", server_address, server_port);
+                http_method = "GET";
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_URL, server_url), "CURLOPT_URL");
+        }
+
+        /* disable body for HEAD request */
+        if (http_method && !strcmp(http_method, "HEAD")) {
+                no_body = true;
+        }
+
+        /* set HTTP protocol version */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, curl_http_version), "CURLOPT_HTTP_VERSION");
+
+        /* set HTTP method */
+        if (http_method) {
+                if (!strcmp(http_method, "POST"))
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_POST, 1), "CURLOPT_POST");
+                else if (!strcmp(http_method, "PUT"))
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_UPLOAD, 1), "CURLOPT_UPLOAD");
+                else
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, http_method), "CURLOPT_CUSTOMREQUEST");
+        }
+
+        /* check if Host header is explicitly set in options */
+        if (http_opt_headers_count) {
+                for (i = 0; i < http_opt_headers_count; i++) {
+                        if (strncmp(http_opt_headers[i], "Host:", 5) == 0) {
+                                force_host_header = http_opt_headers[i];
+                        }
+                }
+        }
+
+        /* set hostname (virtual hosts), not needed if CURLOPT_CONNECT_TO is used, but left in anyway */
+        if (host_name != NULL && force_host_header == NULL) {
+                if ((virtual_port != HTTP_PORT && !use_ssl) || (virtual_port != HTTPS_PORT && use_ssl)) {
+                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s:%d", host_name, virtual_port);
+                } else {
+                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s", host_name);
+                }
+                header_list = curl_slist_append(header_list, http_header);
+        }
+
+        /* always close connection, be nice to servers */
+        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Connection: close");
+        header_list = curl_slist_append(header_list, http_header);
+
+        /* attach additional headers supplied by the user */
+        /* optionally send any other header tag */
+        if (http_opt_headers_count) {
+                for (i = 0; i < http_opt_headers_count; i++) {
+                        header_list = curl_slist_append(header_list, http_opt_headers[i]);
+                }
+                /* This cannot be free'd here because a redirection will then try to access this and segfault */
+                /* Covered in a testcase in tests/check_http.t */
+                /* free(http_opt_headers); */
+        }
+
+        /* set HTTP headers */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header_list), "CURLOPT_HTTPHEADER");
 
 #ifdef LIBCURL_FEATURE_SSL
 
-  /* set SSL version, warn about insecure or unsupported versions */
-  if (use_ssl) {
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_SSLVERSION, ssl_version), "CURLOPT_SSLVERSION");
-  }
-
-  /* client certificate and key to present to server (SSL) */
-  if (client_cert)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_SSLCERT, client_cert), "CURLOPT_SSLCERT");
-  if (client_privkey)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_SSLKEY, client_privkey), "CURLOPT_SSLKEY");
-  if (ca_cert) {
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CAINFO, ca_cert), "CURLOPT_CAINFO");
-  }
-  if (ca_cert || verify_peer_and_host) {
-    /* per default if we have a CA verify both the peer and the
-     * hostname in the certificate, can be switched off later */
-    handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_SSL_VERIFYPEER, 1), "CURLOPT_SSL_VERIFYPEER");
-    handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_SSL_VERIFYHOST, 2), "CURLOPT_SSL_VERIFYHOST");
-  } else {
-    /* backward-compatible behaviour, be tolerant in checks
-     * TODO: depending on more options have aspects we want
-     * to be less tolerant about ssl verfications
-     */
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0), "CURLOPT_SSL_VERIFYPEER");
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0), "CURLOPT_SSL_VERIFYHOST");
-  }
-
-  /* detect SSL library used by libcurl */
-  ssl_library = curlhelp_get_ssl_library ();
-
-  /* try hard to get a stack of certificates to verify against */
-  if (check_cert) {
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1)
-    /* inform curl to report back certificates */
-    switch (ssl_library) {
-      case CURLHELP_SSL_LIBRARY_OPENSSL:
-      case CURLHELP_SSL_LIBRARY_LIBRESSL:
-        /* set callback to extract certificate with OpenSSL context function (works with
-         * OpenSSL-style libraries only!) */
-#ifdef USE_OPENSSL
-        /* libcurl and monitoring plugins built with OpenSSL, good */
-        add_sslctx_verify_fun = true;
-        is_openssl_callback = true;
-#endif /* USE_OPENSSL */
-        /* libcurl is built with OpenSSL, monitoring plugins, so falling
-         * back to manually extracting certificate information */
-        handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
-        break;
-
-      case CURLHELP_SSL_LIBRARY_NSS:
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-        /* NSS: support for CERTINFO is implemented since 7.34.0 */
-        handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
-#else /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-        die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library '%s' is too old)\n", curlhelp_get_ssl_library_string (ssl_library));
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-        break;
-
-      case CURLHELP_SSL_LIBRARY_GNUTLS:
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0)
-        /* GnuTLS: support for CERTINFO is implemented since 7.42.0 */
-        handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
-#else /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
-        die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library '%s' is too old)\n", curlhelp_get_ssl_library_string (ssl_library));
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
-        break;
-
-      case CURLHELP_SSL_LIBRARY_UNKNOWN:
-      default:
-        die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (unknown SSL library '%s', must implement first)\n", curlhelp_get_ssl_library_string (ssl_library));
-        break;
-    }
-#else /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
-    /* old libcurl, our only hope is OpenSSL, otherwise we are out of luck */
-    if (ssl_library == CURLHELP_SSL_LIBRARY_OPENSSL || ssl_library == CURLHELP_SSL_LIBRARY_LIBRESSL)
-      add_sslctx_verify_fun = true;
-    else
-      die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (no CURLOPT_SSL_CTX_FUNCTION, no OpenSSL library or libcurl too old and has no CURLOPT_CERTINFO)\n");
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
-  }
-
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 10, 6) /* required for CURLOPT_SSL_CTX_FUNCTION */
-  // ssl ctx function is not available with all ssl backends
-  if (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, NULL) != CURLE_UNKNOWN_OPTION)
-    handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
-#endif
+        /* set SSL version, warn about insecure or unsupported versions */
+        if (use_ssl) {
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSLVERSION, ssl_version), "CURLOPT_SSLVERSION");
+        }
+
+        /* client certificate and key to present to server (SSL) */
+        if (client_cert)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSLCERT, client_cert), "CURLOPT_SSLCERT");
+        if (client_privkey)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSLKEY, client_privkey), "CURLOPT_SSLKEY");
+        if (ca_cert) {
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CAINFO, ca_cert), "CURLOPT_CAINFO");
+        }
+        if (ca_cert || verify_peer_and_host) {
+                /* per default if we have a CA verify both the peer and the
+                 * hostname in the certificate, can be switched off later */
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1), "CURLOPT_SSL_VERIFYPEER");
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2), "CURLOPT_SSL_VERIFYHOST");
+        } else {
+                /* backward-compatible behaviour, be tolerant in checks
+                 * TODO: depending on more options have aspects we want
+                 * to be less tolerant about ssl verfications
+                 */
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0), "CURLOPT_SSL_VERIFYPEER");
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0), "CURLOPT_SSL_VERIFYHOST");
+        }
+
+        /* detect SSL library used by libcurl */
+        ssl_library = curlhelp_get_ssl_library();
+
+        /* try hard to get a stack of certificates to verify against */
+        if (check_cert) {
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1)
+                /* inform curl to report back certificates */
+                switch (ssl_library) {
+                case CURLHELP_SSL_LIBRARY_OPENSSL:
+                case CURLHELP_SSL_LIBRARY_LIBRESSL:
+                        /* set callback to extract certificate with OpenSSL context function (works with
+                         * OpenSSL-style libraries only!) */
+#               ifdef USE_OPENSSL
+                        /* libcurl and monitoring plugins built with OpenSSL, good */
+                        add_sslctx_verify_fun = true;
+                        is_openssl_callback = true;
+#               endif /* USE_OPENSSL */
+                        /* libcurl is built with OpenSSL, monitoring plugins, so falling
+                         * back to manually extracting certificate information */
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
+                        break;
+
+                case CURLHELP_SSL_LIBRARY_NSS:
+#               if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                        /* NSS: support for CERTINFO is implemented since 7.34.0 */
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
+#               else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library '%s' is too old)\n",
+                                curlhelp_get_ssl_library_string(ssl_library));
+#               endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        break;
+
+                case CURLHELP_SSL_LIBRARY_GNUTLS:
+#               if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0)
+                        /* GnuTLS: support for CERTINFO is implemented since 7.42.0 */
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
+#               else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
+                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library '%s' is too old)\n",
+                                curlhelp_get_ssl_library_string(ssl_library));
+#               endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
+                        break;
+
+                case CURLHELP_SSL_LIBRARY_UNKNOWN:
+                default:
+                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (unknown SSL library '%s', must implement first)\n",
+                                curlhelp_get_ssl_library_string(ssl_library));
+                        break;
+                }
+#       else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
+                /* old libcurl, our only hope is OpenSSL, otherwise we are out of luck */
+                if (ssl_library == CURLHELP_SSL_LIBRARY_OPENSSL || ssl_library == CURLHELP_SSL_LIBRARY_LIBRESSL)
+                        add_sslctx_verify_fun = true;
+                else
+                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (no CURLOPT_SSL_CTX_FUNCTION, no OpenSSL library or libcurl "
+                                                                "too old and has no CURLOPT_CERTINFO)\n");
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
+        }
+
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 10, 6) /* required for CURLOPT_SSL_CTX_FUNCTION */
+        // ssl ctx function is not available with all ssl backends
+        if (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, NULL) != CURLE_UNKNOWN_OPTION)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
+#       endif
 
 #endif /* LIBCURL_FEATURE_SSL */
 
-  /* set default or user-given user agent identification */
-  handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_USERAGENT, user_agent), "CURLOPT_USERAGENT");
-
-  /* proxy-authentication */
-  if (strcmp(proxy_auth, ""))
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_PROXYUSERPWD, proxy_auth), "CURLOPT_PROXYUSERPWD");
-
-  /* authentication */
-  if (strcmp(user_auth, ""))
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_USERPWD, user_auth), "CURLOPT_USERPWD");
-
-  /* TODO: parameter auth method, bitfield of following methods:
-   * CURLAUTH_BASIC (default)
-   * CURLAUTH_DIGEST
-   * CURLAUTH_DIGEST_IE
-   * CURLAUTH_NEGOTIATE
-   * CURLAUTH_NTLM
-   * CURLAUTH_NTLM_WB
-   *
-   * convenience tokens for typical sets of methods:
-   * CURLAUTH_ANYSAFE: most secure, without BASIC
-   * or CURLAUTH_ANY: most secure, even BASIC if necessary
-   *
-   * handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_DIGEST ), "CURLOPT_HTTPAUTH");
-   */
-
-  /* handle redirections */
-  if (onredirect == STATE_DEPENDENT) {
-    if( followmethod == FOLLOW_LIBCURL ) {
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1), "CURLOPT_FOLLOWLOCATION");
-
-      /* default -1 is infinite, not good, could lead to zombie plugins!
-         Setting it to one bigger than maximal limit to handle errors nicely below
-       */
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_MAXREDIRS, max_depth+1), "CURLOPT_MAXREDIRS");
-
-      /* for now allow only http and https (we are a http(s) check plugin in the end) */
+        /* set default or user-given user agent identification */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_USERAGENT, user_agent), "CURLOPT_USERAGENT");
+
+        /* proxy-authentication */
+        if (strcmp(proxy_auth, ""))
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, proxy_auth), "CURLOPT_PROXYUSERPWD");
+
+        /* authentication */
+        if (strcmp(user_auth, ""))
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_USERPWD, user_auth), "CURLOPT_USERPWD");
+
+        /* TODO: parameter auth method, bitfield of following methods:
+         * CURLAUTH_BASIC (default)
+         * CURLAUTH_DIGEST
+         * CURLAUTH_DIGEST_IE
+         * CURLAUTH_NEGOTIATE
+         * CURLAUTH_NTLM
+         * CURLAUTH_NTLM_WB
+         *
+         * convenience tokens for typical sets of methods:
+         * CURLAUTH_ANYSAFE: most secure, without BASIC
+         * or CURLAUTH_ANY: most secure, even BASIC if necessary
+         *
+         * handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_DIGEST ), "CURLOPT_HTTPAUTH");
+         */
+
+        /* handle redirections */
+        if (onredirect == STATE_DEPENDENT) {
+                if (followmethod == FOLLOW_LIBCURL) {
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1), "CURLOPT_FOLLOWLOCATION");
+
+                        /* default -1 is infinite, not good, could lead to zombie plugins!
+                           Setting it to one bigger than maximal limit to handle errors nicely below
+                         */
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_MAXREDIRS, max_depth + 1), "CURLOPT_MAXREDIRS");
+
+                        /* for now allow only http and https (we are a http(s) check plugin in the end) */
 #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 0)
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"), "CURLOPT_REDIR_PROTOCOLS_STR");
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"),
+                                                                                   "CURLOPT_REDIR_PROTOCOLS_STR");
 #elif LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS), "CURLOPT_REDIRECT_PROTOCOLS");
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS),
+                                                                                   "CURLOPT_REDIRECT_PROTOCOLS");
 #endif
 
-      /* TODO: handle the following aspects of redirection, make them
-       * command line options too later:
-        CURLOPT_POSTREDIR: method switch
-        CURLINFO_REDIRECT_URL: custom redirect option
-        CURLOPT_REDIRECT_PROTOCOLS: allow people to step outside safe protocols
-        CURLINFO_REDIRECT_COUNT: get the number of redirects, print it, maybe a range option here is nice like for expected page size?
-      */
-    } else {
-      /* old style redirection is handled below */
-    }
-  }
-
-  /* no-body */
-  if (no_body)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_NOBODY, 1), "CURLOPT_NOBODY");
-
-  /* IPv4 or IPv6 forced DNS resolution */
-  if (address_family == AF_UNSPEC)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER), "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_WHATEVER)");
-  else if (address_family == AF_INET)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4), "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V4)");
-#if defined (USE_IPV6) && defined (LIBCURL_FEATURE_IPV6)
-  else if (address_family == AF_INET6)
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6), "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V6)");
+                        /* TODO: handle the following aspects of redirection, make them
+                         * command line options too later:
+                          CURLOPT_POSTREDIR: method switch
+                          CURLINFO_REDIRECT_URL: custom redirect option
+                          CURLOPT_REDIRECT_PROTOCOLS: allow people to step outside safe protocols
+                          CURLINFO_REDIRECT_COUNT: get the number of redirects, print it, maybe a range option here is nice like for expected page size?
+                        */
+                } else {
+                        /* old style redirection is handled below */
+                }
+        }
+
+        /* no-body */
+        if (no_body)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_NOBODY, 1), "CURLOPT_NOBODY");
+
+        /* IPv4 or IPv6 forced DNS resolution */
+        if (address_family == AF_UNSPEC)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER),
+                                                                           "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_WHATEVER)");
+        else if (address_family == AF_INET)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4),
+                                                                           "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V4)");
+#if defined(USE_IPV6) && defined(LIBCURL_FEATURE_IPV6)
+        else if (address_family == AF_INET6)
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6),
+                                                                           "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V6)");
 #endif
 
-  /* either send http POST data (any data, not only POST)*/
-  if (!strcmp(http_method, "POST") ||!strcmp(http_method, "PUT")) {
-    /* set content of payload for POST and PUT */
-    if (http_content_type) {
-      snprintf (http_header, DEFAULT_BUFFER_SIZE, "Content-Type: %s", http_content_type);
-      header_list = curl_slist_append (header_list, http_header);
-    }
-    /* NULL indicates "HTTP Continue" in libcurl, provide an empty string
-     * in case of no POST/PUT data */
-    if (!http_post_data)
-      http_post_data = "";
-    if (!strcmp(http_method, "POST")) {
-      /* POST method, set payload with CURLOPT_POSTFIELDS */
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_POSTFIELDS, http_post_data), "CURLOPT_POSTFIELDS");
-    } else if (!strcmp(http_method, "PUT")) {
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_READFUNCTION, (curl_read_callback)curlhelp_buffer_read_callback), "CURLOPT_READFUNCTION");
-      if (curlhelp_initreadbuffer (&put_buf, http_post_data, strlen (http_post_data)) < 0)
-        die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating read buffer for PUT\n");
-      put_buf_initialized = true;
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_READDATA, (void *)&put_buf), "CURLOPT_READDATA");
-      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_INFILESIZE, (curl_off_t)strlen (http_post_data)), "CURLOPT_INFILESIZE");
-    }
-  }
-
-  /* cookie handling */
-  if (cookie_jar_file != NULL) {
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR");
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE");
-  }
-
-  /* do the request */
-  res = curl_easy_perform(curl);
-
-  if (verbose>=2 && http_post_data)
-    printf ("**** REQUEST CONTENT ****\n%s\n", http_post_data);
-
-  /* free header and server IP resolve lists, we don't need it anymore */
-  curl_slist_free_all (header_list); header_list = NULL;
-  curl_slist_free_all (server_ips); server_ips = NULL;
-  if (host) {
-    curl_slist_free_all (host); host = NULL;
-  }
-
-  /* Curl errors, result in critical Nagios state */
-  if (res != CURLE_OK) {
-                snprintf (msg,
-                        DEFAULT_BUFFER_SIZE,
-                        _("Invalid HTTP response received from host on port %d: cURL returned %d - %s"),
-                        server_port,
-                        res,
-                        errbuf[0] ? errbuf : curl_easy_strerror(res));
-                die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-  }
-
-  /* certificate checks */
+        /* either send http POST data (any data, not only POST)*/
+        if (!strcmp(http_method, "POST") || !strcmp(http_method, "PUT")) {
+                /* set content of payload for POST and PUT */
+                if (http_content_type) {
+                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Content-Type: %s", http_content_type);
+                        header_list = curl_slist_append(header_list, http_header);
+                }
+                /* NULL indicates "HTTP Continue" in libcurl, provide an empty string
+                 * in case of no POST/PUT data */
+                if (!http_post_data)
+                        http_post_data = "";
+                if (!strcmp(http_method, "POST")) {
+                        /* POST method, set payload with CURLOPT_POSTFIELDS */
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_POSTFIELDS, http_post_data), "CURLOPT_POSTFIELDS");
+                } else if (!strcmp(http_method, "PUT")) {
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)curlhelp_buffer_read_callback),
+                                                                                   "CURLOPT_READFUNCTION");
+                        if (curlhelp_initreadbuffer(&put_buf, http_post_data, strlen(http_post_data)) < 0)
+                                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating read buffer for PUT\n");
+                        put_buf_initialized = true;
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_READDATA, (void *)&put_buf), "CURLOPT_READDATA");
+                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_INFILESIZE, (curl_off_t)strlen(http_post_data)),
+                                                                                   "CURLOPT_INFILESIZE");
+                }
+        }
+
+        /* cookie handling */
+        if (cookie_jar_file != NULL) {
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR");
+                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE");
+        }
+
+        /* do the request */
+        res = curl_easy_perform(curl);
+
+        if (verbose >= 2 && http_post_data)
+                printf("**** REQUEST CONTENT ****\n%s\n", http_post_data);
+
+        /* free header and server IP resolve lists, we don't need it anymore */
+        curl_slist_free_all(header_list);
+        header_list = NULL;
+        curl_slist_free_all(server_ips);
+        server_ips = NULL;
+        if (host) {
+                curl_slist_free_all(host);
+                host = NULL;
+        }
+
+        /* Curl errors, result in critical Nagios state */
+        if (res != CURLE_OK) {
+                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Invalid HTTP response received from host on port %d: cURL returned %d - %s"), server_port,
+                                 res, errbuf[0] ? errbuf : curl_easy_strerror(res));
+                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
+        }
+
+        /* certificate checks */
 #ifdef LIBCURL_FEATURE_SSL
-  if (use_ssl) {
-    if (check_cert) {
-      if (is_openssl_callback) {
-#ifdef USE_OPENSSL
-        /* check certificate with OpenSSL functions, curl has been built against OpenSSL
-         * and we actually have OpenSSL in the monitoring tools
-         */
-        result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
-        if (!continue_after_check_cert) {
-          return result_ssl;
-        }
-#else /* USE_OPENSSL */
-        die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL callback used and not linked against OpenSSL\n");
-#endif /* USE_OPENSSL */
-      } else {
-        int i;
-        struct curl_slist *slist;
-
-        cert_ptr.to_info = NULL;
-        res = curl_easy_getinfo (curl, CURLINFO_CERTINFO, &cert_ptr.to_info);
-        if (!res && cert_ptr.to_info) {
-#ifdef USE_OPENSSL
-          /* We have no OpenSSL in libcurl, but we can use OpenSSL for X509 cert parsing
-           * We only check the first certificate and assume it's the one of the server
-           */
-          const char* raw_cert = NULL;
-          for (i = 0; i < cert_ptr.to_certinfo->num_of_certs; i++) {
-            for (slist = cert_ptr.to_certinfo->certinfo[i]; slist; slist = slist->next) {
-              if (verbose >= 2)
-                printf ("%d ** %s\n", i, slist->data);
-              if (strncmp (slist->data, "Cert:", 5) == 0) {
-                raw_cert = &slist->data[5];
-                goto GOT_FIRST_CERT;
-              }
-            }
-          }
-GOT_FIRST_CERT:
-          if (!raw_cert) {
-                                                snprintf (msg,
-                                                        DEFAULT_BUFFER_SIZE,
-                                                        _("Cannot retrieve certificates from CERTINFO information - certificate data was empty"));
-                                                die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-          }
-          BIO* cert_BIO = BIO_new (BIO_s_mem());
-          BIO_write (cert_BIO, raw_cert, strlen(raw_cert));
-          cert = PEM_read_bio_X509 (cert_BIO, NULL, NULL, NULL);
-          if (!cert) {
-                                                snprintf (msg,
-                                                        DEFAULT_BUFFER_SIZE,
-                                                        _("Cannot read certificate from CERTINFO information - BIO error"));
-                                                die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-          }
-          BIO_free (cert_BIO);
-          result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
-          if (!continue_after_check_cert) {
-            return result_ssl;
-          }
-#else /* USE_OPENSSL */
-          /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our disposal,
-           * so we use the libcurl CURLINFO data
-           */
-          result_ssl = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit);
-          if (!continue_after_check_cert) {
-            return result_ssl;
-          }
-#endif /* USE_OPENSSL */
-        } else {
-                                        snprintf (msg,
-                                                DEFAULT_BUFFER_SIZE,
-                                                _("Cannot retrieve certificates - cURL returned %d - %s"),
-                                                res,
-                                                curl_easy_strerror(res));
-                                        die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-        }
-      }
-    }
-  }
+        if (use_ssl) {
+                if (check_cert) {
+                        if (is_openssl_callback) {
+#       ifdef USE_OPENSSL
+                                /* check certificate with OpenSSL functions, curl has been built against OpenSSL
+                                 * and we actually have OpenSSL in the monitoring tools
+                                 */
+                                result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
+                                if (!continue_after_check_cert) {
+                                        return result_ssl;
+                                }
+#       else  /* USE_OPENSSL */
+                                die(STATE_CRITICAL,
+                                        "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL callback used and not linked against OpenSSL\n");
+#       endif /* USE_OPENSSL */
+                        } else {
+                                int i;
+                                struct curl_slist *slist;
+
+                                cert_ptr.to_info = NULL;
+                                res = curl_easy_getinfo(curl, CURLINFO_CERTINFO, &cert_ptr.to_info);
+                                if (!res && cert_ptr.to_info) {
+#       ifdef USE_OPENSSL
+                                        /* We have no OpenSSL in libcurl, but we can use OpenSSL for X509 cert parsing
+                                         * We only check the first certificate and assume it's the one of the server
+                                         */
+                                        const char *raw_cert = NULL;
+                                        for (i = 0; i < cert_ptr.to_certinfo->num_of_certs; i++) {
+                                                for (slist = cert_ptr.to_certinfo->certinfo[i]; slist; slist = slist->next) {
+                                                        if (verbose >= 2)
+                                                                printf("%d ** %s\n", i, slist->data);
+                                                        if (strncmp(slist->data, "Cert:", 5) == 0) {
+                                                                raw_cert = &slist->data[5];
+                                                                goto GOT_FIRST_CERT;
+                                                        }
+                                                }
+                                        }
+                                GOT_FIRST_CERT:
+                                        if (!raw_cert) {
+                                                snprintf(msg, DEFAULT_BUFFER_SIZE,
+                                                                 _("Cannot retrieve certificates from CERTINFO information - certificate data was empty"));
+                                                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
+                                        }
+                                        BIO *cert_BIO = BIO_new(BIO_s_mem());
+                                        BIO_write(cert_BIO, raw_cert, strlen(raw_cert));
+                                        cert = PEM_read_bio_X509(cert_BIO, NULL, NULL, NULL);
+                                        if (!cert) {
+                                                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Cannot read certificate from CERTINFO information - BIO error"));
+                                                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
+                                        }
+                                        BIO_free(cert_BIO);
+                                        result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
+                                        if (!continue_after_check_cert) {
+                                                return result_ssl;
+                                        }
+#       else  /* USE_OPENSSL */
+                                        /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our disposal,
+                                         * so we use the libcurl CURLINFO data
+                                         */
+                                        result_ssl = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit);
+                                        if (!continue_after_check_cert) {
+                                                return result_ssl;
+                                        }
+#       endif /* USE_OPENSSL */
+                                } else {
+                                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Cannot retrieve certificates - cURL returned %d - %s"), res,
+                                                         curl_easy_strerror(res));
+                                        die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
+                                }
+                        }
+                }
+        }
 #endif /* LIBCURL_FEATURE_SSL */
 
-  /* we got the data and we executed the request in a given time, so we can append
-   * performance data to the answer always
-   */
-  handle_curl_option_return_code (curl_easy_getinfo (curl, CURLINFO_TOTAL_TIME, &total_time), "CURLINFO_TOTAL_TIME");
-  page_len = get_content_length(&header_buf, &body_buf);
-  if(show_extended_perfdata) {
-    handle_curl_option_return_code (curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &time_connect), "CURLINFO_CONNECT_TIME");
-    handle_curl_option_return_code (curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME, &time_appconnect), "CURLINFO_APPCONNECT_TIME");
-    handle_curl_option_return_code (curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &time_headers), "CURLINFO_PRETRANSFER_TIME");
-    handle_curl_option_return_code (curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &time_firstbyte), "CURLINFO_STARTTRANSFER_TIME");
-    snprintf(perfstring, DEFAULT_BUFFER_SIZE, "%s %s %s %s %s %s %s",
-      perfd_time(total_time),
-      perfd_size(page_len),
-      perfd_time_connect(time_connect),
-      use_ssl ? perfd_time_ssl (time_appconnect-time_connect) : "",
-      perfd_time_headers(time_headers - time_appconnect),
-      perfd_time_firstbyte(time_firstbyte - time_headers),
-      perfd_time_transfer(total_time-time_firstbyte)
-    );
-  } else {
-    snprintf(perfstring, DEFAULT_BUFFER_SIZE, "%s %s",
-      perfd_time(total_time),
-      perfd_size(page_len)
-    );
-  }
-
-  /* return a CRITICAL status if we couldn't read any data */
-  if (strlen(header_buf.buf) == 0 && strlen(body_buf.buf) == 0)
-    die (STATE_CRITICAL, _("HTTP CRITICAL - No header received from host\n"));
-
-  /* get status line of answer, check sanity of HTTP code */
-  if (curlhelp_parse_statusline (header_buf.buf, &status_line) < 0) {
-                snprintf (msg,
-                        DEFAULT_BUFFER_SIZE,
-                        "Unparsable status line in %.3g seconds response time|%s\n",
-                        total_time,
-                        perfstring);
-    /* we cannot know the major/minor version here for sure as we cannot parse the first line */
-    die (STATE_CRITICAL, "HTTP CRITICAL HTTP/x.x %ld unknown - %s", code, msg);
-  }
-  status_line_initialized = true;
-
-  /* get result code from cURL */
-  handle_curl_option_return_code (curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &code), "CURLINFO_RESPONSE_CODE");
-  if (verbose>=2)
-    printf ("* curl CURLINFO_RESPONSE_CODE is %ld\n", code);
-
-  /* print status line, header, body if verbose */
-  if (verbose >= 2) {
-    printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header_buf.buf,
-                (no_body ? "  [[ skipped ]]" : body_buf.buf));
-  }
-
-  /* make sure the status line matches the response we are looking for */
-  if (!expected_statuscode(status_line.first_line, server_expect)) {
-    if (server_port == HTTP_PORT)
-                        snprintf(msg,
-                                DEFAULT_BUFFER_SIZE,
-                                _("Invalid HTTP response received from host: %s\n"),
-                                status_line.first_line);
-    else
-                        snprintf(msg,
-                                        DEFAULT_BUFFER_SIZE,
-                                        _("Invalid HTTP response received from host on port %d: %s\n"),
-                                        server_port,
-                                        status_line.first_line);
-    die (STATE_CRITICAL, "HTTP CRITICAL - %s%s%s", msg,
-      show_body ? "\n" : "",
-      show_body ? body_buf.buf : "");
-  }
-
-  if( server_expect_yn  )  {
-    snprintf(msg, DEFAULT_BUFFER_SIZE, _("Status line output matched \"%s\" - "), server_expect);
-    if (verbose)
-      printf ("%s\n",msg);
-    result = STATE_OK;
-  }
-  else {
-    /* illegal return codes result in a critical state */
-    if (code >= 600 || code < 100) {
-      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%d, %.40s)\n"), status_line.http_code, status_line.msg);
-    /* server errors result in a critical state */
-        } else if (code >= 500) {
-      result = STATE_CRITICAL;
-        /* client errors result in a warning state */
-    } else if (code >= 400) {
-      result = STATE_WARNING;
-    /* check redirected page if specified */
-    } else if (code >= 300) {
-      if (onredirect == STATE_DEPENDENT) {
-        if( followmethod == FOLLOW_LIBCURL ) {
-          code = status_line.http_code;
-        } else {
-          /* old check_http style redirection, if we come
-           * back here, we are in the same status as with
-           * the libcurl method
-           */
-          redir (&header_buf);
-        }
-      } else {
-        /* this is a specific code in the command line to
-         * be returned when a redirection is encountered
-         */
-      }
-      result = max_state_alt (onredirect, result);
-    /* all other codes are considered ok */
-    } else {
-      result = STATE_OK;
-    }
-  }
-
-  /* libcurl redirection internally, handle error states here */
-  if( followmethod == FOLLOW_LIBCURL ) {
-    handle_curl_option_return_code (curl_easy_getinfo (curl, CURLINFO_REDIRECT_COUNT, &redir_depth), "CURLINFO_REDIRECT_COUNT");
-    if (verbose >= 2)
-      printf(_("* curl LIBINFO_REDIRECT_COUNT is %d\n"), redir_depth);
-    if (redir_depth > max_depth) {
-      snprintf (msg, DEFAULT_BUFFER_SIZE, "maximum redirection depth %d exceeded in libcurl",
-        max_depth);
-      die (STATE_WARNING, "HTTP WARNING - %s", msg);
-    }
-  }
-
-  /* check status codes, set exit status accordingly */
-  if( status_line.http_code != code ) {
-    die (STATE_CRITICAL, _("HTTP CRITICAL %s %d %s - different HTTP codes (cUrl has %ld)\n"),
-      string_statuscode (status_line.http_major, status_line.http_minor),
-      status_line.http_code, status_line.msg, code);
-  }
-
-  if (maximum_age >= 0) {
-    result = max_state_alt(check_document_dates(&header_buf, &msg), result);
-  }
-
-  /* Page and Header content checks go here */
-
-  if (strlen (header_expect)) {
-    if (!strstr (header_buf.buf, header_expect)) {
-
-      strncpy(&output_header_search[0],header_expect,sizeof(output_header_search));
-
-      if(output_header_search[sizeof(output_header_search)-1]!='\0') {
-        bcopy("...",&output_header_search[sizeof(output_header_search)-4],4);
-      }
+        /* we got the data and we executed the request in a given time, so we can append
+         * performance data to the answer always
+         */
+        handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total_time), "CURLINFO_TOTAL_TIME");
+        page_len = get_content_length(&header_buf, &body_buf);
+        if (show_extended_perfdata) {
+                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &time_connect), "CURLINFO_CONNECT_TIME");
+                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME, &time_appconnect), "CURLINFO_APPCONNECT_TIME");
+                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &time_headers), "CURLINFO_PRETRANSFER_TIME");
+                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &time_firstbyte),
+                                                                           "CURLINFO_STARTTRANSFER_TIME");
+                snprintf(perfstring, DEFAULT_BUFFER_SIZE, "%s %s %s %s %s %s %s", perfd_time(total_time), perfd_size(page_len),
+                                 perfd_time_connect(time_connect), use_ssl ? perfd_time_ssl(time_appconnect - time_connect) : "",
+                                 perfd_time_headers(time_headers - time_appconnect), perfd_time_firstbyte(time_firstbyte - time_headers),
+                                 perfd_time_transfer(total_time - time_firstbyte));
+        } else {
+                snprintf(perfstring, DEFAULT_BUFFER_SIZE, "%s %s", perfd_time(total_time), perfd_size(page_len));
+        }
 
-                                char tmp[DEFAULT_BUFFER_SIZE];
+        /* return a CRITICAL status if we couldn't read any data */
+        if (strlen(header_buf.buf) == 0 && strlen(body_buf.buf) == 0)
+                die(STATE_CRITICAL, _("HTTP CRITICAL - No header received from host\n"));
 
-                                snprintf (tmp,
-                                        DEFAULT_BUFFER_SIZE,
-                                        _("%sheader '%s' not found on '%s://%s:%d%s', "),
-                                        msg,
-                                        output_header_search,
-                                        use_ssl ? "https" : "http",
-                                        host_name ? host_name : server_address,
-                                        server_port,
-                                        server_url);
+        /* get status line of answer, check sanity of HTTP code */
+        if (curlhelp_parse_statusline(header_buf.buf, &status_line) < 0) {
+                snprintf(msg, DEFAULT_BUFFER_SIZE, "Unparsable status line in %.3g seconds response time|%s\n", total_time, perfstring);
+                /* we cannot know the major/minor version here for sure as we cannot parse the first line */
+                die(STATE_CRITICAL, "HTTP CRITICAL HTTP/x.x %ld unknown - %s", code, msg);
+        }
+        status_line_initialized = true;
 
-                                strcpy(msg, tmp);
+        /* get result code from cURL */
+        handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code), "CURLINFO_RESPONSE_CODE");
+        if (verbose >= 2)
+                printf("* curl CURLINFO_RESPONSE_CODE is %ld\n", code);
 
-                                result = STATE_CRITICAL;
-    }
-  }
+        /* print status line, header, body if verbose */
+        if (verbose >= 2) {
+                printf("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header_buf.buf, (no_body ? "  [[ skipped ]]" : body_buf.buf));
+        }
 
-  if (strlen (string_expect)) {
-    if (!strstr (body_buf.buf, string_expect)) {
+        /* make sure the status line matches the response we are looking for */
+        if (!expected_statuscode(status_line.first_line, server_expect)) {
+                if (server_port == HTTP_PORT)
+                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Invalid HTTP response received from host: %s\n"), status_line.first_line);
+                else
+                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Invalid HTTP response received from host on port %d: %s\n"), server_port,
+                                         status_line.first_line);
+                die(STATE_CRITICAL, "HTTP CRITICAL - %s%s%s", msg, show_body ? "\n" : "", show_body ? body_buf.buf : "");
+        }
 
-      strncpy(&output_string_search[0],string_expect,sizeof(output_string_search));
+        if (server_expect_yn) {
+                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Status line output matched \"%s\" - "), server_expect);
+                if (verbose)
+                        printf("%s\n", msg);
+                result = STATE_OK;
+        } else {
+                /* illegal return codes result in a critical state */
+                if (code >= 600 || code < 100) {
+                        die(STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%d, %.40s)\n"), status_line.http_code, status_line.msg);
+                        /* server errors result in a critical state */
+                } else if (code >= 500) {
+                        result = STATE_CRITICAL;
+                        /* client errors result in a warning state */
+                } else if (code >= 400) {
+                        result = STATE_WARNING;
+                        /* check redirected page if specified */
+                } else if (code >= 300) {
+                        if (onredirect == STATE_DEPENDENT) {
+                                if (followmethod == FOLLOW_LIBCURL) {
+                                        code = status_line.http_code;
+                                } else {
+                                        /* old check_http style redirection, if we come
+                                         * back here, we are in the same status as with
+                                         * the libcurl method
+                                         */
+                                        redir(&header_buf);
+                                }
+                        } else {
+                                /* this is a specific code in the command line to
+                                 * be returned when a redirection is encountered
+                                 */
+                        }
+                        result = max_state_alt(onredirect, result);
+                        /* all other codes are considered ok */
+                } else {
+                        result = STATE_OK;
+                }
+        }
 
-      if(output_string_search[sizeof(output_string_search)-1]!='\0') {
-        bcopy("...",&output_string_search[sizeof(output_string_search)-4],4);
-      }
+        /* libcurl redirection internally, handle error states here */
+        if (followmethod == FOLLOW_LIBCURL) {
+                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_REDIRECT_COUNT, &redir_depth), "CURLINFO_REDIRECT_COUNT");
+                if (verbose >= 2)
+                        printf(_("* curl LIBINFO_REDIRECT_COUNT is %d\n"), redir_depth);
+                if (redir_depth > max_depth) {
+                        snprintf(msg, DEFAULT_BUFFER_SIZE, "maximum redirection depth %d exceeded in libcurl", max_depth);
+                        die(STATE_WARNING, "HTTP WARNING - %s", msg);
+                }
+        }
+
+        /* check status codes, set exit status accordingly */
+        if (status_line.http_code != code) {
+                die(STATE_CRITICAL, _("HTTP CRITICAL %s %d %s - different HTTP codes (cUrl has %ld)\n"),
+                        string_statuscode(status_line.http_major, status_line.http_minor), status_line.http_code, status_line.msg, code);
+        }
+
+        if (maximum_age >= 0) {
+                result = max_state_alt(check_document_dates(&header_buf, &msg), result);
+        }
+
+        /* Page and Header content checks go here */
+
+        if (strlen(header_expect)) {
+                if (!strstr(header_buf.buf, header_expect)) {
+
+                        strncpy(&output_header_search[0], header_expect, sizeof(output_header_search));
+
+                        if (output_header_search[sizeof(output_header_search) - 1] != '\0') {
+                                bcopy("...", &output_header_search[sizeof(output_header_search) - 4], 4);
+                        }
+
+                        char tmp[DEFAULT_BUFFER_SIZE];
+
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sheader '%s' not found on '%s://%s:%d%s', "), msg, output_header_search,
+                                         use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
+
+                        strcpy(msg, tmp);
+
+                        result = STATE_CRITICAL;
+                }
+        }
+
+        if (strlen(string_expect)) {
+                if (!strstr(body_buf.buf, string_expect)) {
+
+                        strncpy(&output_string_search[0], string_expect, sizeof(output_string_search));
+
+                        if (output_string_search[sizeof(output_string_search) - 1] != '\0') {
+                                bcopy("...", &output_string_search[sizeof(output_string_search) - 4], 4);
+                        }
 
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        snprintf (tmp,
-                                        DEFAULT_BUFFER_SIZE,
-                                        _("%sstring '%s' not found on '%s://%s:%d%s', "),
-                                        msg,
-                                        output_string_search,
-                                        use_ssl ? "https" : "http",
-                                        host_name ? host_name : server_address,
-                                        server_port,
-                                        server_url);
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search,
+                                         use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
 
                         strcpy(msg, tmp);
 
                         result = STATE_CRITICAL;
-    }
-  }
-
-  if (strlen (regexp)) {
-    errcode = regexec (&preg, body_buf.buf, REGS, pmatch, 0);
-    if ((errcode == 0 && !invert_regex) || (errcode == REG_NOMATCH && invert_regex)) {
-      /* OK - No-op to avoid changing the logic around it */
-      result = max_state_alt(STATE_OK, result);
-    }
-    else if ((errcode == REG_NOMATCH && !invert_regex) || (errcode == 0 && invert_regex)) {
+                }
+        }
+
+        if (strlen(regexp)) {
+                errcode = regexec(&preg, body_buf.buf, REGS, pmatch, 0);
+                if ((errcode == 0 && !invert_regex) || (errcode == REG_NOMATCH && invert_regex)) {
+                        /* OK - No-op to avoid changing the logic around it */
+                        result = max_state_alt(STATE_OK, result);
+                } else if ((errcode == REG_NOMATCH && !invert_regex) || (errcode == 0 && invert_regex)) {
                         if (!invert_regex) {
                                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spattern not found, "), msg);
+                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spattern not found, "), msg);
                                 strcpy(msg, tmp);
 
                         } else {
                                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spattern found, "), msg);
+                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spattern found, "), msg);
                                 strcpy(msg, tmp);
-
                         }
                         result = state_regex;
                 } else {
-                        regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                        regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
 
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sExecute Error: %s, "), msg, errbuf);
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sExecute Error: %s, "), msg, errbuf);
                         strcpy(msg, tmp);
                         result = STATE_UNKNOWN;
                 }
-  }
+        }
 
-  /* make sure the page is of an appropriate size */
+        /* make sure the page is of an appropriate size */
         if ((max_page_len > 0) && (page_len > max_page_len)) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too large, "), msg, page_len);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too large, "), msg, page_len);
 
                 strcpy(msg, tmp);
 
@@ -1175,1281 +1117,1230 @@ GOT_FIRST_CERT:
         } else if ((min_page_len > 0) && (page_len < min_page_len)) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too small, "), msg, page_len);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too small, "), msg, page_len);
                 strcpy(msg, tmp);
                 result = max_state_alt(STATE_WARNING, result);
         }
 
-  /* -w, -c: check warning and critical level */
-  result = max_state_alt(get_status(total_time, thlds), result);
-
-  /* Cut-off trailing characters */
-  if (strlen(msg) >= 2) {
-      if(msg[strlen(msg)-2] == ',')
-        msg[strlen(msg)-2] = '\0';
-      else
-        msg[strlen(msg)-3] = '\0';
-    }
-
-  /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */
-  die (max_state_alt(result, result_ssl), "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s",
-    state_text(result), string_statuscode (status_line.http_major, status_line.http_minor),
-    status_line.http_code, status_line.msg,
-    strlen(msg) > 0 ? " - " : "",
-    msg, page_len, total_time,
-    (display_html ? "</A>" : ""),
-    perfstring,
-    (show_body ? body_buf.buf : ""),
-    (show_body ? "\n" : "") );
-
-  return max_state_alt(result, result_ssl);
+        /* -w, -c: check warning and critical level */
+        result = max_state_alt(get_status(total_time, thlds), result);
+
+        /* Cut-off trailing characters */
+        if (strlen(msg) >= 2) {
+                if (msg[strlen(msg) - 2] == ',')
+                        msg[strlen(msg) - 2] = '\0';
+                else
+                        msg[strlen(msg) - 3] = '\0';
+        }
+
+        /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */
+        die(max_state_alt(result, result_ssl), "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s", state_text(result),
+                string_statuscode(status_line.http_major, status_line.http_minor), status_line.http_code, status_line.msg,
+                strlen(msg) > 0 ? " - " : "", msg, page_len, total_time, (display_html ? "</A>" : ""), perfstring, (show_body ? body_buf.buf : ""),
+                (show_body ? "\n" : ""));
+
+        return max_state_alt(result, result_ssl);
 }
 
-int
-uri_strcmp (const UriTextRangeA range, const char* s)
-{
-  if (!range.first) return -1;
-  if ( (size_t)(range.afterLast - range.first) < strlen (s) ) return -1;
-  return strncmp (s, range.first, min( (size_t)(range.afterLast - range.first), strlen (s)));
+int uri_strcmp(const UriTextRangeA range, const char *s) {
+        if (!range.first)
+                return -1;
+        if ((size_t)(range.afterLast - range.first) < strlen(s))
+                return -1;
+        return strncmp(s, range.first, min((size_t)(range.afterLast - range.first), strlen(s)));
 }
 
-char*
-uri_string (const UriTextRangeA range, char* buf, size_t buflen)
-{
-  if (!range.first) return "(null)";
-  strncpy (buf, range.first, max (buflen-1, (size_t)(range.afterLast - range.first)));
-  buf[max (buflen-1, (size_t)(range.afterLast - range.first))] = '\0';
-  buf[range.afterLast - range.first] = '\0';
-  return buf;
+char *uri_string(const UriTextRangeA range, char *buf, size_t buflen) {
+        if (!range.first)
+                return "(null)";
+        strncpy(buf, range.first, max(buflen - 1, (size_t)(range.afterLast - range.first)));
+        buf[max(buflen - 1, (size_t)(range.afterLast - range.first))] = '\0';
+        buf[range.afterLast - range.first] = '\0';
+        return buf;
 }
 
-void
-redir (curlhelp_write_curlbuf* header_buf)
-{
-  char *location = NULL;
-  curlhelp_statusline status_line;
-  struct phr_header headers[255];
-  size_t nof_headers = 255;
-  size_t msglen;
-  char buf[DEFAULT_BUFFER_SIZE];
-  char ipstr[INET_ADDR_MAX_SIZE];
-  int new_port;
-  char *new_host;
-  char *new_url;
-
-  int res = phr_parse_response (header_buf->buf, header_buf->buflen,
-    &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen,
-    headers, &nof_headers, 0);
+void redir(curlhelp_write_curlbuf *header_buf) {
+        char *location = NULL;
+        curlhelp_statusline status_line;
+        struct phr_header headers[255];
+        size_t nof_headers = 255;
+        size_t msglen;
+        char buf[DEFAULT_BUFFER_SIZE];
+        char ipstr[INET_ADDR_MAX_SIZE];
+        int new_port;
+        char *new_host;
+        char *new_url;
+
+        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major, &status_line.http_minor,
+                                                                 &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0);
 
         if (res == -1) {
-                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
-        }
-
-  location = get_header_value (headers, nof_headers, "location");
-
-  if (verbose >= 2)
-    printf(_("* Seen redirect location %s\n"), location);
-
-  if (++redir_depth > max_depth)
-    die (STATE_WARNING,
-         _("HTTP WARNING - maximum redirection depth %d exceeded - %s%s\n"),
-         max_depth, location, (display_html ? "</A>" : ""));
-
-  UriParserStateA state;
-  UriUriA uri;
-  state.uri = &uri;
-  if (uriParseUriA (&state, location) != URI_SUCCESS) {
-    if (state.errorCode == URI_ERROR_SYNTAX) {
-      die (STATE_UNKNOWN,
-           _("HTTP UNKNOWN - Could not parse redirect location '%s'%s\n"),
-           location, (display_html ? "</A>" : ""));
-    } else if (state.errorCode == URI_ERROR_MALLOC) {
-      die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
-    }
-  }
-
-  if (verbose >= 2) {
-    printf (_("** scheme: %s\n"),
-      uri_string (uri.scheme, buf, DEFAULT_BUFFER_SIZE));
-    printf (_("** host: %s\n"),
-      uri_string (uri.hostText, buf, DEFAULT_BUFFER_SIZE));
-    printf (_("** port: %s\n"),
-      uri_string (uri.portText, buf, DEFAULT_BUFFER_SIZE));
-    if (uri.hostData.ip4) {
-      inet_ntop (AF_INET, uri.hostData.ip4->data, ipstr, sizeof (ipstr));
-      printf (_("** IPv4: %s\n"), ipstr);
-    }
-    if (uri.hostData.ip6) {
-      inet_ntop (AF_INET, uri.hostData.ip6->data, ipstr, sizeof (ipstr));
-      printf (_("** IPv6: %s\n"), ipstr);
-    }
-    if (uri.pathHead) {
-      printf (_("** path: "));
-      const UriPathSegmentA* p = uri.pathHead;
-      for (; p; p = p->next) {
-        printf ("/%s", uri_string (p->text, buf, DEFAULT_BUFFER_SIZE));
-      }
-      puts ("");
-    }
-    if (uri.query.first) {
-      printf (_("** query: %s\n"),
-      uri_string (uri.query, buf, DEFAULT_BUFFER_SIZE));
-    }
-    if (uri.fragment.first) {
-      printf (_("** fragment: %s\n"),
-      uri_string (uri.fragment, buf, DEFAULT_BUFFER_SIZE));
-    }
-  }
-
-  if (uri.scheme.first) {
-    if (!uri_strcmp (uri.scheme, "https"))
-      use_ssl = true;
-    else
-      use_ssl = false;
-  }
-
-  /* we do a sloppy test here only, because uriparser would have failed
-   * above, if the port would be invalid, we just check for MAX_PORT
-   */
-  if (uri.portText.first) {
-    new_port = atoi (uri_string (uri.portText, buf, DEFAULT_BUFFER_SIZE));
-  } else {
-    new_port = HTTP_PORT;
-    if (use_ssl)
-      new_port = HTTPS_PORT;
-  }
-  if (new_port > MAX_PORT)
-    die (STATE_UNKNOWN,
-         _("HTTP UNKNOWN - Redirection to port above %d - %s%s\n"),
-         MAX_PORT, location, display_html ? "</A>" : "");
-
-  /* by RFC 7231 relative URLs in Location should be taken relative to
-   * the original URL, so we try to form a new absolute URL here
-   */
-  if (!uri.scheme.first && !uri.hostText.first) {
-    new_host = strdup (host_name ? host_name : server_address);
-    new_port = server_port;
-    if(use_ssl)
-      uri_string (uri.scheme, "https", DEFAULT_BUFFER_SIZE);
-  } else {
-    new_host = strdup (uri_string (uri.hostText, buf, DEFAULT_BUFFER_SIZE));
-  }
-
-  /* compose new path */
-  /* TODO: handle fragments and query part of URL */
-  new_url = (char *)calloc( 1, DEFAULT_BUFFER_SIZE);
-  if (uri.pathHead) {
-    const UriPathSegmentA* p = uri.pathHead;
-    for (; p; p = p->next) {
-      strncat (new_url, "/", DEFAULT_BUFFER_SIZE);
-      strncat (new_url, uri_string (p->text, buf, DEFAULT_BUFFER_SIZE), DEFAULT_BUFFER_SIZE-1);
-    }
-  }
-
-  if (server_port==new_port &&
-      !strncmp(server_address, new_host, MAX_IPV4_HOSTLENGTH) &&
-      (host_name && !strncmp(host_name, new_host, MAX_IPV4_HOSTLENGTH)) &&
-      !strcmp(server_url, new_url))
-    die (STATE_CRITICAL,
-         _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"),
-         use_ssl ? "https" : "http", new_host, new_port, new_url, (display_html ? "</A>" : ""));
-
-  /* set new values for redirected request */
-
-  if (!(followsticky & STICKY_HOST)) {
-    free (server_address);
-    server_address = strndup (new_host, MAX_IPV4_HOSTLENGTH);
-  }
-  if (!(followsticky & STICKY_PORT)) {
-    server_port = (unsigned short)new_port;
-  }
-
-  free (host_name);
-  host_name = strndup (new_host, MAX_IPV4_HOSTLENGTH);
-
-  /* reset virtual port */
-  virtual_port = server_port;
-
-  free(new_host);
-  free (server_url);
-  server_url = new_url;
-
-  uriFreeUriMembersA (&uri);
-
-  if (verbose)
-    printf (_("Redirection to %s://%s:%d%s\n"), use_ssl ? "https" : "http",
-            host_name ? host_name : server_address, server_port, server_url);
-
-  /* TODO: the hash component MUST be taken from the original URL and
-   * attached to the URL in Location
-   */
-
-  cleanup ();
-  check_http ();
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
+        location = get_header_value(headers, nof_headers, "location");
+
+        if (verbose >= 2)
+                printf(_("* Seen redirect location %s\n"), location);
+
+        if (++redir_depth > max_depth)
+                die(STATE_WARNING, _("HTTP WARNING - maximum redirection depth %d exceeded - %s%s\n"), max_depth, location,
+                        (display_html ? "</A>" : ""));
+
+        UriParserStateA state;
+        UriUriA uri;
+        state.uri = &uri;
+        if (uriParseUriA(&state, location) != URI_SUCCESS) {
+                if (state.errorCode == URI_ERROR_SYNTAX) {
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not parse redirect location '%s'%s\n"), location, (display_html ? "</A>" : ""));
+                } else if (state.errorCode == URI_ERROR_MALLOC) {
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+                }
+        }
+
+        if (verbose >= 2) {
+                printf(_("** scheme: %s\n"), uri_string(uri.scheme, buf, DEFAULT_BUFFER_SIZE));
+                printf(_("** host: %s\n"), uri_string(uri.hostText, buf, DEFAULT_BUFFER_SIZE));
+                printf(_("** port: %s\n"), uri_string(uri.portText, buf, DEFAULT_BUFFER_SIZE));
+                if (uri.hostData.ip4) {
+                        inet_ntop(AF_INET, uri.hostData.ip4->data, ipstr, sizeof(ipstr));
+                        printf(_("** IPv4: %s\n"), ipstr);
+                }
+                if (uri.hostData.ip6) {
+                        inet_ntop(AF_INET, uri.hostData.ip6->data, ipstr, sizeof(ipstr));
+                        printf(_("** IPv6: %s\n"), ipstr);
+                }
+                if (uri.pathHead) {
+                        printf(_("** path: "));
+                        const UriPathSegmentA *p = uri.pathHead;
+                        for (; p; p = p->next) {
+                                printf("/%s", uri_string(p->text, buf, DEFAULT_BUFFER_SIZE));
+                        }
+                        puts("");
+                }
+                if (uri.query.first) {
+                        printf(_("** query: %s\n"), uri_string(uri.query, buf, DEFAULT_BUFFER_SIZE));
+                }
+                if (uri.fragment.first) {
+                        printf(_("** fragment: %s\n"), uri_string(uri.fragment, buf, DEFAULT_BUFFER_SIZE));
+                }
+        }
+
+        if (uri.scheme.first) {
+                if (!uri_strcmp(uri.scheme, "https"))
+                        use_ssl = true;
+                else
+                        use_ssl = false;
+        }
+
+        /* we do a sloppy test here only, because uriparser would have failed
+         * above, if the port would be invalid, we just check for MAX_PORT
+         */
+        if (uri.portText.first) {
+                new_port = atoi(uri_string(uri.portText, buf, DEFAULT_BUFFER_SIZE));
+        } else {
+                new_port = HTTP_PORT;
+                if (use_ssl)
+                        new_port = HTTPS_PORT;
+        }
+        if (new_port > MAX_PORT)
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Redirection to port above %d - %s%s\n"), MAX_PORT, location, display_html ? "</A>" : "");
+
+        /* by RFC 7231 relative URLs in Location should be taken relative to
+         * the original URL, so we try to form a new absolute URL here
+         */
+        if (!uri.scheme.first && !uri.hostText.first) {
+                new_host = strdup(host_name ? host_name : server_address);
+                new_port = server_port;
+                if (use_ssl)
+                        uri_string(uri.scheme, "https", DEFAULT_BUFFER_SIZE);
+        } else {
+                new_host = strdup(uri_string(uri.hostText, buf, DEFAULT_BUFFER_SIZE));
+        }
+
+        /* compose new path */
+        /* TODO: handle fragments and query part of URL */
+        new_url = (char *)calloc(1, DEFAULT_BUFFER_SIZE);
+        if (uri.pathHead) {
+                const UriPathSegmentA *p = uri.pathHead;
+                for (; p; p = p->next) {
+                        strncat(new_url, "/", DEFAULT_BUFFER_SIZE);
+                        strncat(new_url, uri_string(p->text, buf, DEFAULT_BUFFER_SIZE), DEFAULT_BUFFER_SIZE - 1);
+                }
+        }
+
+        if (server_port == new_port && !strncmp(server_address, new_host, MAX_IPV4_HOSTLENGTH) &&
+                (host_name && !strncmp(host_name, new_host, MAX_IPV4_HOSTLENGTH)) && !strcmp(server_url, new_url))
+                die(STATE_CRITICAL, _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"), use_ssl ? "https" : "http",
+                        new_host, new_port, new_url, (display_html ? "</A>" : ""));
+
+        /* set new values for redirected request */
+
+        if (!(followsticky & STICKY_HOST)) {
+                free(server_address);
+                server_address = strndup(new_host, MAX_IPV4_HOSTLENGTH);
+        }
+        if (!(followsticky & STICKY_PORT)) {
+                server_port = (unsigned short)new_port;
+        }
+
+        free(host_name);
+        host_name = strndup(new_host, MAX_IPV4_HOSTLENGTH);
+
+        /* reset virtual port */
+        virtual_port = server_port;
+
+        free(new_host);
+        free(server_url);
+        server_url = new_url;
+
+        uriFreeUriMembersA(&uri);
+
+        if (verbose)
+                printf(_("Redirection to %s://%s:%d%s\n"), use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port,
+                           server_url);
+
+        /* TODO: the hash component MUST be taken from the original URL and
+         * attached to the URL in Location
+         */
+
+        cleanup();
+        check_http();
 }
 
 /* check whether a file exists */
-void
-test_file (char *path)
-{
-  if (access(path, R_OK) == 0)
-    return;
-  usage2 (_("file does not exist or is not readable"), path);
+void test_file(char *path) {
+        if (access(path, R_OK) == 0)
+                return;
+        usage2(_("file does not exist or is not readable"), path);
 }
 
-bool
-process_arguments (int argc, char **argv)
-{
-  char *p;
-  int c = 1;
-  char *temp;
-
-  enum {
-    INVERT_REGEX = CHAR_MAX + 1,
-    SNI_OPTION,
-    MAX_REDIRS_OPTION,
-    CONTINUE_AFTER_CHECK_CERT,
-    CA_CERT_OPTION,
-    HTTP_VERSION_OPTION,
-    AUTOMATIC_DECOMPRESSION,
-    COOKIE_JAR,
-    HAPROXY_PROTOCOL,
-    STATE_REGEX
-  };
-
-  int option = 0;
-  int got_plus = 0;
-  static struct option longopts[] = {
-    STD_LONG_OPTS,
-    {"link", no_argument, 0, 'L'},
-    {"nohtml", no_argument, 0, 'n'},
-    {"ssl", optional_argument, 0, 'S'},
-    {"sni", no_argument, 0, SNI_OPTION},
-    {"post", required_argument, 0, 'P'},
-    {"method", required_argument, 0, 'j'},
-    {"IP-address", required_argument, 0, 'I'},
-    {"url", required_argument, 0, 'u'},
-    {"port", required_argument, 0, 'p'},
-    {"authorization", required_argument, 0, 'a'},
-    {"proxy-authorization", required_argument, 0, 'b'},
-    {"header-string", required_argument, 0, 'd'},
-    {"string", required_argument, 0, 's'},
-    {"expect", required_argument, 0, 'e'},
-    {"regex", required_argument, 0, 'r'},
-    {"ereg", required_argument, 0, 'r'},
-    {"eregi", required_argument, 0, 'R'},
-    {"linespan", no_argument, 0, 'l'},
-    {"onredirect", required_argument, 0, 'f'},
-    {"certificate", required_argument, 0, 'C'},
-    {"client-cert", required_argument, 0, 'J'},
-    {"private-key", required_argument, 0, 'K'},
-    {"ca-cert", required_argument, 0, CA_CERT_OPTION},
-    {"verify-cert", no_argument, 0, 'D'},
-    {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT},
-    {"useragent", required_argument, 0, 'A'},
-    {"header", required_argument, 0, 'k'},
-    {"no-body", no_argument, 0, 'N'},
-    {"max-age", required_argument, 0, 'M'},
-    {"content-type", required_argument, 0, 'T'},
-    {"pagesize", required_argument, 0, 'm'},
-    {"invert-regex", no_argument, NULL, INVERT_REGEX},
-    {"state-regex", required_argument, 0, STATE_REGEX},
-    {"use-ipv4", no_argument, 0, '4'},
-    {"use-ipv6", no_argument, 0, '6'},
-    {"extended-perfdata", no_argument, 0, 'E'},
-    {"show-body", no_argument, 0, 'B'},
-    {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
-    {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
-    {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
-    {"cookie-jar", required_argument, 0, COOKIE_JAR},
-    {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return false;
-
-  /* support check_http compatible arguments */
-  for (c = 1; c < argc; c++) {
-    if (strcmp ("-to", argv[c]) == 0)
-      strcpy (argv[c], "-t");
-    if (strcmp ("-hn", argv[c]) == 0)
-      strcpy (argv[c], "-H");
-    if (strcmp ("-wt", argv[c]) == 0)
-      strcpy (argv[c], "-w");
-    if (strcmp ("-ct", argv[c]) == 0)
-      strcpy (argv[c], "-c");
-    if (strcmp ("-nohtml", argv[c]) == 0)
-      strcpy (argv[c], "-n");
-  }
-
-  server_url = strdup(DEFAULT_SERVER_URL);
-
-  while (1) {
-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:DnlLS::m:M:NEB", longopts, &option);
-    if (c == -1 || c == EOF || c == 1)
-      break;
-
-    switch (c) {
-    case 'h':
-      print_help();
-      exit(STATE_UNKNOWN);
-      break;
-    case 'V':
-      print_revision(progname, NP_VERSION);
-      print_curl_version();
-      exit(STATE_UNKNOWN);
-      break;
-    case 'v':
-      verbose++;
-      break;
-    case 't': /* timeout period */
-      if (!is_intnonneg (optarg))
-        usage2 (_("Timeout interval must be a positive integer"), optarg);
-      else
-        socket_timeout = (int)strtol (optarg, NULL, 10);
-      break;
-    case 'c': /* critical time threshold */
-      critical_thresholds = optarg;
-      break;
-    case 'w': /* warning time threshold */
-      warning_thresholds = optarg;
-      break;
-    case 'H': /* virtual host */
-      host_name = strdup (optarg);
-      if (host_name[0] == '[') {
-        if ((p = strstr (host_name, "]:")) != NULL) { /* [IPv6]:port */
-          virtual_port = atoi (p + 2);
-          /* cut off the port */
-          host_name_length = strlen (host_name) - strlen (p) - 1;
-          free (host_name);
-          host_name = strndup (optarg, host_name_length);
-        }
-      } else if ((p = strchr (host_name, ':')) != NULL
-                 && strchr (++p, ':') == NULL) { /* IPv4:port or host:port */
-          virtual_port = atoi (p);
-          /* cut off the port */
-          host_name_length = strlen (host_name) - strlen (p) - 1;
-          free (host_name);
-          host_name = strndup (optarg, host_name_length);
-        }
-      break;
-    case 'I': /* internet address */
-      server_address = strdup (optarg);
-      break;
-    case 'u': /* URL path */
-      server_url = strdup (optarg);
-      break;
-    case 'p': /* Server port */
-      if (!is_intnonneg (optarg))
-        usage2 (_("Invalid port number, expecting a non-negative number"), optarg);
-      else {
-        if( strtol(optarg, NULL, 10) > MAX_PORT)
-          usage2 (_("Invalid port number, supplied port number is too big"), optarg);
-        server_port = (unsigned short)strtol(optarg, NULL, 10);
-        specify_port = true;
-      }
-      break;
-    case 'a': /* authorization info */
-      strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
-      user_auth[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 'b': /* proxy-authorization info */
-      strncpy (proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
-      proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */
-      if (! http_post_data)
-        http_post_data = strdup (optarg);
-      if (! http_method)
-        http_method = strdup("POST");
-      break;
-    case 'j': /* Set HTTP method */
-      if (http_method)
-        free(http_method);
-      http_method = strdup (optarg);
-      break;
-    case 'A': /* useragent */
-      strncpy (user_agent, optarg, DEFAULT_BUFFER_SIZE);
-      user_agent[DEFAULT_BUFFER_SIZE-1] = '\0';
-      break;
-    case 'k': /* Additional headers */
-      if (http_opt_headers_count == 0)
-        http_opt_headers = malloc (sizeof (char *) * (++http_opt_headers_count));
-      else
-        http_opt_headers = realloc (http_opt_headers, sizeof (char *) * (++http_opt_headers_count));
-      http_opt_headers[http_opt_headers_count - 1] = optarg;
-      break;
-    case 'L': /* show html link */
-      display_html = true;
-      break;
-    case 'n': /* do not show html link */
-      display_html = false;
-      break;
-    case 'C': /* Check SSL cert validity */
+bool process_arguments(int argc, char **argv) {
+        char *p;
+        int c = 1;
+        char *temp;
+
+        enum {
+                INVERT_REGEX = CHAR_MAX + 1,
+                SNI_OPTION,
+                MAX_REDIRS_OPTION,
+                CONTINUE_AFTER_CHECK_CERT,
+                CA_CERT_OPTION,
+                HTTP_VERSION_OPTION,
+                AUTOMATIC_DECOMPRESSION,
+                COOKIE_JAR,
+                HAPROXY_PROTOCOL,
+                STATE_REGEX
+        };
+
+        int option = 0;
+        int got_plus = 0;
+        static struct option longopts[] = {STD_LONG_OPTS,
+                                                                           {"link", no_argument, 0, 'L'},
+                                                                           {"nohtml", no_argument, 0, 'n'},
+                                                                           {"ssl", optional_argument, 0, 'S'},
+                                                                           {"sni", no_argument, 0, SNI_OPTION},
+                                                                           {"post", required_argument, 0, 'P'},
+                                                                           {"method", required_argument, 0, 'j'},
+                                                                           {"IP-address", required_argument, 0, 'I'},
+                                                                           {"url", required_argument, 0, 'u'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"authorization", required_argument, 0, 'a'},
+                                                                           {"proxy-authorization", required_argument, 0, 'b'},
+                                                                           {"header-string", required_argument, 0, 'd'},
+                                                                           {"string", required_argument, 0, 's'},
+                                                                           {"expect", required_argument, 0, 'e'},
+                                                                           {"regex", required_argument, 0, 'r'},
+                                                                           {"ereg", required_argument, 0, 'r'},
+                                                                           {"eregi", required_argument, 0, 'R'},
+                                                                           {"linespan", no_argument, 0, 'l'},
+                                                                           {"onredirect", required_argument, 0, 'f'},
+                                                                           {"certificate", required_argument, 0, 'C'},
+                                                                           {"client-cert", required_argument, 0, 'J'},
+                                                                           {"private-key", required_argument, 0, 'K'},
+                                                                           {"ca-cert", required_argument, 0, CA_CERT_OPTION},
+                                                                           {"verify-cert", no_argument, 0, 'D'},
+                                                                           {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT},
+                                                                           {"useragent", required_argument, 0, 'A'},
+                                                                           {"header", required_argument, 0, 'k'},
+                                                                           {"no-body", no_argument, 0, 'N'},
+                                                                           {"max-age", required_argument, 0, 'M'},
+                                                                           {"content-type", required_argument, 0, 'T'},
+                                                                           {"pagesize", required_argument, 0, 'm'},
+                                                                           {"invert-regex", no_argument, NULL, INVERT_REGEX},
+                                                                           {"state-regex", required_argument, 0, STATE_REGEX},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"extended-perfdata", no_argument, 0, 'E'},
+                                                                           {"show-body", no_argument, 0, 'B'},
+                                                                           {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
+                                                                           {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
+                                                                           {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
+                                                                           {"cookie-jar", required_argument, 0, COOKIE_JAR},
+                                                                           {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2)
+                return false;
+
+        /* support check_http compatible arguments */
+        for (c = 1; c < argc; c++) {
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+                if (strcmp("-hn", argv[c]) == 0)
+                        strcpy(argv[c], "-H");
+                if (strcmp("-wt", argv[c]) == 0)
+                        strcpy(argv[c], "-w");
+                if (strcmp("-ct", argv[c]) == 0)
+                        strcpy(argv[c], "-c");
+                if (strcmp("-nohtml", argv[c]) == 0)
+                        strcpy(argv[c], "-n");
+        }
+
+        server_url = strdup(DEFAULT_SERVER_URL);
+
+        while (1) {
+                c = getopt_long(argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:DnlLS::m:M:NEB", longopts, &option);
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+
+                switch (c) {
+                case 'h':
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                        break;
+                case 'V':
+                        print_revision(progname, NP_VERSION);
+                        print_curl_version();
+                        exit(STATE_UNKNOWN);
+                        break;
+                case 'v':
+                        verbose++;
+                        break;
+                case 't': /* timeout period */
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        else
+                                socket_timeout = (int)strtol(optarg, NULL, 10);
+                        break;
+                case 'c': /* critical time threshold */
+                        critical_thresholds = optarg;
+                        break;
+                case 'w': /* warning time threshold */
+                        warning_thresholds = optarg;
+                        break;
+                case 'H': /* virtual host */
+                        host_name = strdup(optarg);
+                        if (host_name[0] == '[') {
+                                if ((p = strstr(host_name, "]:")) != NULL) { /* [IPv6]:port */
+                                        virtual_port = atoi(p + 2);
+                                        /* cut off the port */
+                                        host_name_length = strlen(host_name) - strlen(p) - 1;
+                                        free(host_name);
+                                        host_name = strndup(optarg, host_name_length);
+                                }
+                        } else if ((p = strchr(host_name, ':')) != NULL && strchr(++p, ':') == NULL) { /* IPv4:port or host:port */
+                                virtual_port = atoi(p);
+                                /* cut off the port */
+                                host_name_length = strlen(host_name) - strlen(p) - 1;
+                                free(host_name);
+                                host_name = strndup(optarg, host_name_length);
+                        }
+                        break;
+                case 'I': /* internet address */
+                        server_address = strdup(optarg);
+                        break;
+                case 'u': /* URL path */
+                        server_url = strdup(optarg);
+                        break;
+                case 'p': /* Server port */
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Invalid port number, expecting a non-negative number"), optarg);
+                        else {
+                                if (strtol(optarg, NULL, 10) > MAX_PORT)
+                                        usage2(_("Invalid port number, supplied port number is too big"), optarg);
+                                server_port = (unsigned short)strtol(optarg, NULL, 10);
+                                specify_port = true;
+                        }
+                        break;
+                case 'a': /* authorization info */
+                        strncpy(user_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        user_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 'b': /* proxy-authorization info */
+                        strncpy(proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */
+                        if (!http_post_data)
+                                http_post_data = strdup(optarg);
+                        if (!http_method)
+                                http_method = strdup("POST");
+                        break;
+                case 'j': /* Set HTTP method */
+                        if (http_method)
+                                free(http_method);
+                        http_method = strdup(optarg);
+                        break;
+                case 'A': /* useragent */
+                        strncpy(user_agent, optarg, DEFAULT_BUFFER_SIZE);
+                        user_agent[DEFAULT_BUFFER_SIZE - 1] = '\0';
+                        break;
+                case 'k': /* Additional headers */
+                        if (http_opt_headers_count == 0)
+                                http_opt_headers = malloc(sizeof(char *) * (++http_opt_headers_count));
+                        else
+                                http_opt_headers = realloc(http_opt_headers, sizeof(char *) * (++http_opt_headers_count));
+                        http_opt_headers[http_opt_headers_count - 1] = optarg;
+                        break;
+                case 'L': /* show html link */
+                        display_html = true;
+                        break;
+                case 'n': /* do not show html link */
+                        display_html = false;
+                        break;
+                case 'C': /* Check SSL cert validity */
 #ifdef LIBCURL_FEATURE_SSL
-      if ((temp=strchr(optarg,','))!=NULL) {
-        *temp='\0';
-        if (!is_intnonneg (optarg))
-          usage2 (_("Invalid certificate expiration period"), optarg);
-        days_till_exp_warn = atoi(optarg);
-        *temp=',';
-        temp++;
-        if (!is_intnonneg (temp))
-          usage2 (_("Invalid certificate expiration period"), temp);
-        days_till_exp_crit = atoi (temp);
-      }
-      else {
-        days_till_exp_crit=0;
-        if (!is_intnonneg (optarg))
-          usage2 (_("Invalid certificate expiration period"), optarg);
-        days_till_exp_warn = atoi (optarg);
-      }
-      check_cert = true;
-      goto enable_ssl;
+                        if ((temp = strchr(optarg, ',')) != NULL) {
+                                *temp = '\0';
+                                if (!is_intnonneg(optarg))
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                days_till_exp_warn = atoi(optarg);
+                                *temp = ',';
+                                temp++;
+                                if (!is_intnonneg(temp))
+                                        usage2(_("Invalid certificate expiration period"), temp);
+                                days_till_exp_crit = atoi(temp);
+                        } else {
+                                days_till_exp_crit = 0;
+                                if (!is_intnonneg(optarg))
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                days_till_exp_warn = atoi(optarg);
+                        }
+                        check_cert = true;
+                        goto enable_ssl;
 #endif
-    case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */
+                case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */
 #ifdef HAVE_SSL
-      continue_after_check_cert = true;
-      break;
+                        continue_after_check_cert = true;
+                        break;
 #endif
-    case 'J': /* use client certificate */
+                case 'J': /* use client certificate */
 #ifdef LIBCURL_FEATURE_SSL
-      test_file(optarg);
-      client_cert = optarg;
-      goto enable_ssl;
+                        test_file(optarg);
+                        client_cert = optarg;
+                        goto enable_ssl;
 #endif
-    case 'K': /* use client private key */
+                case 'K': /* use client private key */
 #ifdef LIBCURL_FEATURE_SSL
-      test_file(optarg);
-      client_privkey = optarg;
-      goto enable_ssl;
+                        test_file(optarg);
+                        client_privkey = optarg;
+                        goto enable_ssl;
 #endif
 #ifdef LIBCURL_FEATURE_SSL
-    case CA_CERT_OPTION: /* use CA chain file */
-      test_file(optarg);
-      ca_cert = optarg;
-      goto enable_ssl;
+                case CA_CERT_OPTION: /* use CA chain file */
+                        test_file(optarg);
+                        ca_cert = optarg;
+                        goto enable_ssl;
 #endif
 #ifdef LIBCURL_FEATURE_SSL
-    case 'D': /* verify peer certificate & host */
-      verify_peer_and_host = true;
-      break;
+                case 'D': /* verify peer certificate & host */
+                        verify_peer_and_host = true;
+                        break;
 #endif
-    case 'S': /* use SSL */
+                case 'S': /* use SSL */
 #ifdef LIBCURL_FEATURE_SSL
-    enable_ssl:
-      use_ssl = true;
-      /* ssl_version initialized to CURL_SSLVERSION_DEFAULT as a default.
-       * Only set if it's non-zero.  This helps when we include multiple
-       * parameters, like -S and -C combinations */
-      ssl_version = CURL_SSLVERSION_DEFAULT;
-      if (c=='S' && optarg != NULL) {
-        char *plus_ptr = strchr(optarg, '+');
-        if (plus_ptr) {
-          got_plus = 1;
-          *plus_ptr = '\0';
-        }
-
-        if (optarg[0] == '2')
-          ssl_version = CURL_SSLVERSION_SSLv2;
-        else if (optarg[0] == '3')
-          ssl_version = CURL_SSLVERSION_SSLv3;
-        else if (!strcmp (optarg, "1") || !strcmp (optarg, "1.0"))
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-          ssl_version = CURL_SSLVERSION_TLSv1_0;
-#else
-          ssl_version = CURL_SSLVERSION_DEFAULT;
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-        else if (!strcmp (optarg, "1.1"))
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-          ssl_version = CURL_SSLVERSION_TLSv1_1;
-#else
-          ssl_version = CURL_SSLVERSION_DEFAULT;
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-        else if (!strcmp (optarg, "1.2"))
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-          ssl_version = CURL_SSLVERSION_TLSv1_2;
-#else
-          ssl_version = CURL_SSLVERSION_DEFAULT;
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-        else if (!strcmp (optarg, "1.3"))
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0)
-          ssl_version = CURL_SSLVERSION_TLSv1_3;
-#else
-          ssl_version = CURL_SSLVERSION_DEFAULT;
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0) */
-        else
-          usage4 (_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2, 1.3 (with optional '+' suffix)"));
-      }
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0)
-      if (got_plus) {
-        switch (ssl_version) {
-          case CURL_SSLVERSION_TLSv1_3:
-            ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
-            break;
-          case CURL_SSLVERSION_TLSv1_2:
-          case CURL_SSLVERSION_TLSv1_1:
-          case CURL_SSLVERSION_TLSv1_0:
-            ssl_version |= CURL_SSLVERSION_MAX_DEFAULT;
-            break;
-        }
-      } else {
-        switch (ssl_version) {
-          case CURL_SSLVERSION_TLSv1_3:
-            ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
-            break;
-          case CURL_SSLVERSION_TLSv1_2:
-            ssl_version |= CURL_SSLVERSION_MAX_TLSv1_2;
-            break;
-          case CURL_SSLVERSION_TLSv1_1:
-            ssl_version |= CURL_SSLVERSION_MAX_TLSv1_1;
-            break;
-          case CURL_SSLVERSION_TLSv1_0:
-            ssl_version |= CURL_SSLVERSION_MAX_TLSv1_0;
-            break;
-        }
-      }
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0) */
-      if (verbose >= 2)
-        printf(_("* Set SSL/TLS version to %d\n"), ssl_version);
-      if (!specify_port)
-        server_port = HTTPS_PORT;
-      break;
-#else /* LIBCURL_FEATURE_SSL */
-      /* -C -J and -K fall through to here without SSL */
-      usage4 (_("Invalid option - SSL is not available"));
-      break;
-    case SNI_OPTION: /* --sni is parsed, but ignored, the default is true with libcurl */
-      use_sni = true;
-      break;
+                enable_ssl:
+                        use_ssl = true;
+                        /* ssl_version initialized to CURL_SSLVERSION_DEFAULT as a default.
+                         * Only set if it's non-zero.  This helps when we include multiple
+                         * parameters, like -S and -C combinations */
+                        ssl_version = CURL_SSLVERSION_DEFAULT;
+                        if (c == 'S' && optarg != NULL) {
+                                char *plus_ptr = strchr(optarg, '+');
+                                if (plus_ptr) {
+                                        got_plus = 1;
+                                        *plus_ptr = '\0';
+                                }
+
+                                if (optarg[0] == '2')
+                                        ssl_version = CURL_SSLVERSION_SSLv2;
+                                else if (optarg[0] == '3')
+                                        ssl_version = CURL_SSLVERSION_SSLv3;
+                                else if (!strcmp(optarg, "1") || !strcmp(optarg, "1.0"))
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                                        ssl_version = CURL_SSLVERSION_TLSv1_0;
+#       else
+                                        ssl_version = CURL_SSLVERSION_DEFAULT;
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                                else if (!strcmp(optarg, "1.1"))
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                                        ssl_version = CURL_SSLVERSION_TLSv1_1;
+#       else
+                                        ssl_version = CURL_SSLVERSION_DEFAULT;
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                                else if (!strcmp(optarg, "1.2"))
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                                        ssl_version = CURL_SSLVERSION_TLSv1_2;
+#       else
+                                        ssl_version = CURL_SSLVERSION_DEFAULT;
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                                else if (!strcmp(optarg, "1.3"))
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0)
+                                        ssl_version = CURL_SSLVERSION_TLSv1_3;
+#       else
+                                        ssl_version = CURL_SSLVERSION_DEFAULT;
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0) */
+                                else
+                                        usage4(_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2, 1.3 (with optional '+' suffix)"));
+                        }
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0)
+                        if (got_plus) {
+                                switch (ssl_version) {
+                                case CURL_SSLVERSION_TLSv1_3:
+                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
+                                        break;
+                                case CURL_SSLVERSION_TLSv1_2:
+                                case CURL_SSLVERSION_TLSv1_1:
+                                case CURL_SSLVERSION_TLSv1_0:
+                                        ssl_version |= CURL_SSLVERSION_MAX_DEFAULT;
+                                        break;
+                                }
+                        } else {
+                                switch (ssl_version) {
+                                case CURL_SSLVERSION_TLSv1_3:
+                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
+                                        break;
+                                case CURL_SSLVERSION_TLSv1_2:
+                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_2;
+                                        break;
+                                case CURL_SSLVERSION_TLSv1_1:
+                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_1;
+                                        break;
+                                case CURL_SSLVERSION_TLSv1_0:
+                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_0;
+                                        break;
+                                }
+                        }
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0) */
+                        if (verbose >= 2)
+                                printf(_("* Set SSL/TLS version to %d\n"), ssl_version);
+                        if (!specify_port)
+                                server_port = HTTPS_PORT;
+                        break;
+#else  /* LIBCURL_FEATURE_SSL */
+                        /* -C -J and -K fall through to here without SSL */
+                        usage4(_("Invalid option - SSL is not available"));
+                        break;
+                case SNI_OPTION: /* --sni is parsed, but ignored, the default is true with libcurl */
+                        use_sni = true;
+                        break;
 #endif /* LIBCURL_FEATURE_SSL */
-    case MAX_REDIRS_OPTION:
-      if (!is_intnonneg (optarg))
-        usage2 (_("Invalid max_redirs count"), optarg);
-      else {
-        max_depth = atoi (optarg);
-      }
-      break;
-    case 'f': /* onredirect */
-      if (!strcmp (optarg, "ok"))
-        onredirect = STATE_OK;
-      else if (!strcmp (optarg, "warning"))
-        onredirect = STATE_WARNING;
-      else if (!strcmp (optarg, "critical"))
-        onredirect = STATE_CRITICAL;
-      else if (!strcmp (optarg, "unknown"))
-        onredirect = STATE_UNKNOWN;
-      else if (!strcmp (optarg, "follow"))
-        onredirect = STATE_DEPENDENT;
-      else if (!strcmp (optarg, "stickyport"))
-        onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_HOST|STICKY_PORT;
-      else if (!strcmp (optarg, "sticky"))
-        onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_HOST;
-      else if (!strcmp (optarg, "follow"))
-        onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_NONE;
-      else if (!strcmp (optarg, "curl"))
-        onredirect = STATE_DEPENDENT, followmethod = FOLLOW_LIBCURL;
-      else usage2 (_("Invalid onredirect option"), optarg);
-      if (verbose >= 2)
-        printf(_("* Following redirects set to %s\n"), state_text(onredirect));
-      break;
-    case 'd': /* string or substring */
-      strncpy (header_expect, optarg, MAX_INPUT_BUFFER - 1);
-      header_expect[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 's': /* string or substring */
-      strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
-      string_expect[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 'e': /* string or substring */
-      strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
-      server_expect[MAX_INPUT_BUFFER - 1] = 0;
-      server_expect_yn = 1;
-      break;
-    case 'T': /* Content-type */
-      http_content_type = strdup (optarg);
-     break;
-    case 'l': /* linespan */
-      cflags &= ~REG_NEWLINE;
-      break;
-    case 'R': /* regex */
-      cflags |= REG_ICASE;
+                case MAX_REDIRS_OPTION:
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Invalid max_redirs count"), optarg);
+                        else {
+                                max_depth = atoi(optarg);
+                        }
+                        break;
+                case 'f': /* onredirect */
+                        if (!strcmp(optarg, "ok"))
+                                onredirect = STATE_OK;
+                        else if (!strcmp(optarg, "warning"))
+                                onredirect = STATE_WARNING;
+                        else if (!strcmp(optarg, "critical"))
+                                onredirect = STATE_CRITICAL;
+                        else if (!strcmp(optarg, "unknown"))
+                                onredirect = STATE_UNKNOWN;
+                        else if (!strcmp(optarg, "follow"))
+                                onredirect = STATE_DEPENDENT;
+                        else if (!strcmp(optarg, "stickyport"))
+                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_HOST | STICKY_PORT;
+                        else if (!strcmp(optarg, "sticky"))
+                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_HOST;
+                        else if (!strcmp(optarg, "follow"))
+                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_NONE;
+                        else if (!strcmp(optarg, "curl"))
+                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_LIBCURL;
+                        else
+                                usage2(_("Invalid onredirect option"), optarg);
+                        if (verbose >= 2)
+                                printf(_("* Following redirects set to %s\n"), state_text(onredirect));
+                        break;
+                case 'd': /* string or substring */
+                        strncpy(header_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        header_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 's': /* string or substring */
+                        strncpy(string_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        string_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 'e': /* string or substring */
+                        strncpy(server_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        server_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        server_expect_yn = 1;
+                        break;
+                case 'T': /* Content-type */
+                        http_content_type = strdup(optarg);
+                        break;
+                case 'l': /* linespan */
+                        cflags &= ~REG_NEWLINE;
+                        break;
+                case 'R': /* regex */
+                        cflags |= REG_ICASE;
                         // fall through
-    case 'r': /* regex */
-      strncpy (regexp, optarg, MAX_RE_SIZE - 1);
-      regexp[MAX_RE_SIZE - 1] = 0;
-      errcode = regcomp (&preg, regexp, cflags);
-      if (errcode != 0) {
-        (void) regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-        printf (_("Could Not Compile Regular Expression: %s"), errbuf);
-        return false;
-      }
-      break;
-    case INVERT_REGEX:
-      invert_regex = true;
-      break;
-    case STATE_REGEX:
-      if (!strcasecmp (optarg, "critical"))
-        state_regex = STATE_CRITICAL;
-      else if (!strcasecmp (optarg, "warning"))
-        state_regex = STATE_WARNING;
-      else usage2 (_("Invalid state-regex option"), optarg);
-      break;
-    case '4':
-      address_family = AF_INET;
-      break;
-    case '6':
-#if defined (USE_IPV6) && defined (LIBCURL_FEATURE_IPV6)
-      address_family = AF_INET6;
+                case 'r': /* regex */
+                        strncpy(regexp, optarg, MAX_RE_SIZE - 1);
+                        regexp[MAX_RE_SIZE - 1] = 0;
+                        errcode = regcomp(&preg, regexp, cflags);
+                        if (errcode != 0) {
+                                (void)regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Could Not Compile Regular Expression: %s"), errbuf);
+                                return false;
+                        }
+                        break;
+                case INVERT_REGEX:
+                        invert_regex = true;
+                        break;
+                case STATE_REGEX:
+                        if (!strcasecmp(optarg, "critical"))
+                                state_regex = STATE_CRITICAL;
+                        else if (!strcasecmp(optarg, "warning"))
+                                state_regex = STATE_WARNING;
+                        else
+                                usage2(_("Invalid state-regex option"), optarg);
+                        break;
+                case '4':
+                        address_family = AF_INET;
+                        break;
+                case '6':
+#if defined(USE_IPV6) && defined(LIBCURL_FEATURE_IPV6)
+                        address_family = AF_INET6;
 #else
-      usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
-      break;
-    case 'm': /* min_page_length */
-      {
-      char *tmp;
-      if (strchr(optarg, ':') != (char *)NULL) {
-        /* range, so get two values, min:max */
-        tmp = strtok(optarg, ":");
-        if (tmp == NULL) {
-          printf("Bad format: try \"-m min:max\"\n");
-          exit (STATE_WARNING);
-        } else
-          min_page_len = atoi(tmp);
-
-        tmp = strtok(NULL, ":");
-        if (tmp == NULL) {
-          printf("Bad format: try \"-m min:max\"\n");
-          exit (STATE_WARNING);
-        } else
-          max_page_len = atoi(tmp);
-      } else
-        min_page_len = atoi (optarg);
-      break;
-      }
-    case 'N': /* no-body */
-      no_body = true;
-      break;
-    case 'M': /* max-age */
-    {
-      int L = strlen(optarg);
-      if (L && optarg[L-1] == 'm')
-        maximum_age = atoi (optarg) * 60;
-      else if (L && optarg[L-1] == 'h')
-        maximum_age = atoi (optarg) * 60 * 60;
-      else if (L && optarg[L-1] == 'd')
-        maximum_age = atoi (optarg) * 60 * 60 * 24;
-      else if (L && (optarg[L-1] == 's' ||
-                     isdigit (optarg[L-1])))
-        maximum_age = atoi (optarg);
-      else {
-        fprintf (stderr, "unparsable max-age: %s\n", optarg);
-        exit (STATE_WARNING);
-      }
-      if (verbose >= 2)
-        printf ("* Maximal age of document set to %d seconds\n", maximum_age);
-    }
-    break;
-    case 'E': /* show extended perfdata */
-      show_extended_perfdata = true;
-      break;
-    case 'B': /* print body content after status line */
-      show_body = true;
-      break;
-    case HTTP_VERSION_OPTION:
-      curl_http_version = CURL_HTTP_VERSION_NONE;
-      if (strcmp (optarg, "1.0") == 0) {
-        curl_http_version = CURL_HTTP_VERSION_1_0;
-      } else if (strcmp (optarg, "1.1") == 0) {
-        curl_http_version = CURL_HTTP_VERSION_1_1;
-      } else if ((strcmp (optarg, "2.0") == 0) || (strcmp (optarg, "2") == 0)) {
+                        break;
+                case 'm': /* min_page_length */
+                {
+                        char *tmp;
+                        if (strchr(optarg, ':') != (char *)NULL) {
+                                /* range, so get two values, min:max */
+                                tmp = strtok(optarg, ":");
+                                if (tmp == NULL) {
+                                        printf("Bad format: try \"-m min:max\"\n");
+                                        exit(STATE_WARNING);
+                                } else
+                                        min_page_len = atoi(tmp);
+
+                                tmp = strtok(NULL, ":");
+                                if (tmp == NULL) {
+                                        printf("Bad format: try \"-m min:max\"\n");
+                                        exit(STATE_WARNING);
+                                } else
+                                        max_page_len = atoi(tmp);
+                        } else
+                                min_page_len = atoi(optarg);
+                        break;
+                }
+                case 'N': /* no-body */
+                        no_body = true;
+                        break;
+                case 'M': /* max-age */
+                {
+                        int L = strlen(optarg);
+                        if (L && optarg[L - 1] == 'm')
+                                maximum_age = atoi(optarg) * 60;
+                        else if (L && optarg[L - 1] == 'h')
+                                maximum_age = atoi(optarg) * 60 * 60;
+                        else if (L && optarg[L - 1] == 'd')
+                                maximum_age = atoi(optarg) * 60 * 60 * 24;
+                        else if (L && (optarg[L - 1] == 's' || isdigit(optarg[L - 1])))
+                                maximum_age = atoi(optarg);
+                        else {
+                                fprintf(stderr, "unparsable max-age: %s\n", optarg);
+                                exit(STATE_WARNING);
+                        }
+                        if (verbose >= 2)
+                                printf("* Maximal age of document set to %d seconds\n", maximum_age);
+                } break;
+                case 'E': /* show extended perfdata */
+                        show_extended_perfdata = true;
+                        break;
+                case 'B': /* print body content after status line */
+                        show_body = true;
+                        break;
+                case HTTP_VERSION_OPTION:
+                        curl_http_version = CURL_HTTP_VERSION_NONE;
+                        if (strcmp(optarg, "1.0") == 0) {
+                                curl_http_version = CURL_HTTP_VERSION_1_0;
+                        } else if (strcmp(optarg, "1.1") == 0) {
+                                curl_http_version = CURL_HTTP_VERSION_1_1;
+                        } else if ((strcmp(optarg, "2.0") == 0) || (strcmp(optarg, "2") == 0)) {
 #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 33, 0)
-        curl_http_version = CURL_HTTP_VERSION_2_0;
+                                curl_http_version = CURL_HTTP_VERSION_2_0;
 #else
-        curl_http_version = CURL_HTTP_VERSION_NONE;
+                                curl_http_version = CURL_HTTP_VERSION_NONE;
 #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 33, 0) */
-      } else {
-        fprintf (stderr, "unknown http-version parameter: %s\n", optarg);
-        exit (STATE_WARNING);
-      }
-      break;
-    case AUTOMATIC_DECOMPRESSION:
-      automatic_decompression = true;
-      break;
-    case COOKIE_JAR:
-      cookie_jar_file = optarg;
-      break;
-    case HAPROXY_PROTOCOL:
-      haproxy_protocol = true;
-      break;
-    case '?':
-      /* print short usage statement if args not parsable */
-      usage5 ();
-      break;
-    }
-  }
-
-  c = optind;
-
-  if (server_address == NULL && c < argc)
-    server_address = strdup (argv[c++]);
-
-  if (host_name == NULL && c < argc)
-    host_name = strdup (argv[c++]);
-
-  if (server_address == NULL) {
-    if (host_name == NULL)
-      usage4 (_("You must specify a server address or host name"));
-    else
-      server_address = strdup (host_name);
-  }
-
-  set_thresholds(&thlds, warning_thresholds, critical_thresholds);
-
-  if (critical_thresholds && thlds->critical->end>(double)socket_timeout)
-    socket_timeout = (int)thlds->critical->end + 1;
-  if (verbose >= 2)
-    printf ("* Socket timeout set to %ld seconds\n", socket_timeout);
-
-  if (http_method == NULL)
-    http_method = strdup ("GET");
-
-  if (client_cert && !client_privkey)
-    usage4 (_("If you use a client certificate you must also specify a private key file"));
-
-  if (virtual_port == 0)
-    virtual_port = server_port;
-  else {
-    if ((use_ssl && server_port == HTTPS_PORT) || (!use_ssl && server_port == HTTP_PORT))
-      if(!specify_port)
-        server_port = virtual_port;
-  }
-
-  return true;
+                        } else {
+                                fprintf(stderr, "unknown http-version parameter: %s\n", optarg);
+                                exit(STATE_WARNING);
+                        }
+                        break;
+                case AUTOMATIC_DECOMPRESSION:
+                        automatic_decompression = true;
+                        break;
+                case COOKIE_JAR:
+                        cookie_jar_file = optarg;
+                        break;
+                case HAPROXY_PROTOCOL:
+                        haproxy_protocol = true;
+                        break;
+                case '?':
+                        /* print short usage statement if args not parsable */
+                        usage5();
+                        break;
+                }
+        }
+
+        c = optind;
+
+        if (server_address == NULL && c < argc)
+                server_address = strdup(argv[c++]);
+
+        if (host_name == NULL && c < argc)
+                host_name = strdup(argv[c++]);
+
+        if (server_address == NULL) {
+                if (host_name == NULL)
+                        usage4(_("You must specify a server address or host name"));
+                else
+                        server_address = strdup(host_name);
+        }
+
+        set_thresholds(&thlds, warning_thresholds, critical_thresholds);
+
+        if (critical_thresholds && thlds->critical->end > (double)socket_timeout)
+                socket_timeout = (int)thlds->critical->end + 1;
+        if (verbose >= 2)
+                printf("* Socket timeout set to %ld seconds\n", socket_timeout);
+
+        if (http_method == NULL)
+                http_method = strdup("GET");
+
+        if (client_cert && !client_privkey)
+                usage4(_("If you use a client certificate you must also specify a private key file"));
+
+        if (virtual_port == 0)
+                virtual_port = server_port;
+        else {
+                if ((use_ssl && server_port == HTTPS_PORT) || (!use_ssl && server_port == HTTP_PORT))
+                        if (!specify_port)
+                                server_port = virtual_port;
+        }
+
+        return true;
 }
 
-char *perfd_time (double elapsed_time)
-{
-  return fperfdata ("time", elapsed_time, "s",
-            thlds->warning?true:false, thlds->warning?thlds->warning->end:0,
-            thlds->critical?true:false, thlds->critical?thlds->critical->end:0,
-                   true, 0, true, socket_timeout);
+char *perfd_time(double elapsed_time) {
+        return fperfdata("time", elapsed_time, "s", thlds->warning ? true : false, thlds->warning ? thlds->warning->end : 0,
+                                         thlds->critical ? true : false, thlds->critical ? thlds->critical->end : 0, true, 0, true, socket_timeout);
 }
 
-char *perfd_time_connect (double elapsed_time_connect)
-{
-  return fperfdata ("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_connect(double elapsed_time_connect) {
+        return fperfdata("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 
-char *perfd_time_ssl (double elapsed_time_ssl)
-{
-  return fperfdata ("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_ssl(double elapsed_time_ssl) {
+        return fperfdata("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 
-char *perfd_time_headers (double elapsed_time_headers)
-{
-  return fperfdata ("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_headers(double elapsed_time_headers) {
+        return fperfdata("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 
-char *perfd_time_firstbyte (double elapsed_time_firstbyte)
-{
-  return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_firstbyte(double elapsed_time_firstbyte) {
+        return fperfdata("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 
-char *perfd_time_transfer (double elapsed_time_transfer)
-{
-  return fperfdata ("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_transfer(double elapsed_time_transfer) {
+        return fperfdata("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 
-char *perfd_size (int page_len)
-{
-  return perfdata ("size", page_len, "B",
-            (min_page_len>0?true:false), min_page_len,
-            (min_page_len>0?true:false), 0,
-            true, 0, false, 0);
+char *perfd_size(int page_len) {
+        return perfdata("size", page_len, "B", (min_page_len > 0 ? true : false), min_page_len, (min_page_len > 0 ? true : false), 0, true, 0,
+                                        false, 0);
 }
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-  printf ("%s\n", _("This plugin tests the HTTP service on the specified host. It can test"));
-  printf ("%s\n", _("normal (http) and secure (https) servers, follow redirects, search for"));
-  printf ("%s\n", _("strings and regular expressions, check connection times, and report on"));
-  printf ("%s\n", _("certificate expiration times."));
-  printf ("\n");
-  printf ("%s\n", _("It makes use of libcurl to do so. It tries to be as compatible to check_http"));
-  printf ("%s\n", _("as possible."));
+        printf("%s\n", _("This plugin tests the HTTP service on the specified host. It can test"));
+        printf("%s\n", _("normal (http) and secure (https) servers, follow redirects, search for"));
+        printf("%s\n", _("strings and regular expressions, check connection times, and report on"));
+        printf("%s\n", _("certificate expiration times."));
+        printf("\n");
+        printf("%s\n", _("It makes use of libcurl to do so. It tries to be as compatible to check_http"));
+        printf("%s\n", _("as possible."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-  print_usage ();
+        print_usage();
 
-  printf (_("NOTE: One or both of -H and -I must be specified"));
+        printf(_("NOTE: One or both of -H and -I must be specified"));
 
-  printf ("\n");
+        printf("\n");
 
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-  printf (" %s\n", "-H, --hostname=ADDRESS");
-  printf ("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
-  printf ("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
-  printf (" %s\n", "-I, --IP-address=ADDRESS");
-  printf ("    %s\n", _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
-  printf (" %s\n", "-p, --port=INTEGER");
-  printf ("    %s", _("Port number (default: "));
-  printf ("%d)\n", HTTP_PORT);
+        printf(" %s\n", "-H, --hostname=ADDRESS");
+        printf("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
+        printf("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
+        printf(" %s\n", "-I, --IP-address=ADDRESS");
+        printf("    %s\n", _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
+        printf(" %s\n", "-p, --port=INTEGER");
+        printf("    %s", _("Port number (default: "));
+        printf("%d)\n", HTTP_PORT);
 
-  printf (UT_IPv46);
+        printf(UT_IPv46);
 
 #ifdef LIBCURL_FEATURE_SSL
-  printf (" %s\n", "-S, --ssl=VERSION[+]");
-  printf ("    %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
-  printf ("    %s\n", _("auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"));
-  printf ("    %s\n", _("1.2 = TLSv1.2, 1.3 = TLSv1.3). With a '+' suffix, newer versions are also accepted."));
-  printf ("    %s\n", _("Note: SSLv2 and SSLv3 are deprecated and are usually disabled in libcurl"));
-  printf (" %s\n", "--sni");
-  printf ("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
-#if LIBCURL_VERSION_NUM >= 0x071801
-  printf ("    %s\n", _("Note: --sni is the default in libcurl as SSLv2 and SSLV3 are deprecated and"));
-  printf ("    %s\n", _("      SNI only really works since TLSv1.0"));
-#else
-  printf ("    %s\n", _("Note: SNI is not supported in libcurl before 7.18.1"));
-#endif
-  printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443."));
-  printf ("    %s\n", _("A STATE_WARNING is returned if the certificate has a validity less than the"));
-  printf ("    %s\n", _("first agument's value. If there is a second argument and the certificate's"));
-  printf ("    %s\n", _("validity is less than its value, a STATE_CRITICAL is returned."));
-  printf ("    %s\n", _("(When this option is used the URL is not checked by default. You can use"));
-  printf ("    %s\n", _(" --continue-after-certificate to override this behavior)"));
-  printf (" %s\n", "--continue-after-certificate");
-  printf ("    %s\n", _("Allows the HTTP check to continue after performing the certificate check."));
-  printf ("    %s\n", _("Does nothing unless -C is used."));
-  printf (" %s\n", "-J, --client-cert=FILE");
-  printf ("   %s\n", _("Name of file that contains the client certificate (PEM format)"));
-  printf ("   %s\n", _("to be used in establishing the SSL session"));
-  printf (" %s\n", "-K, --private-key=FILE");
-  printf ("   %s\n", _("Name of file containing the private key (PEM format)"));
-  printf ("   %s\n", _("matching the client certificate"));
-  printf (" %s\n", "--ca-cert=FILE");
-  printf ("   %s\n", _("CA certificate file to verify peer against"));
-  printf (" %s\n", "-D, --verify-cert");
-  printf ("   %s\n", _("Verify the peer's SSL certificate and hostname"));
+        printf(" %s\n", "-S, --ssl=VERSION[+]");
+        printf("    %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
+        printf("    %s\n", _("auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"));
+        printf("    %s\n", _("1.2 = TLSv1.2, 1.3 = TLSv1.3). With a '+' suffix, newer versions are also accepted."));
+        printf("    %s\n", _("Note: SSLv2 and SSLv3 are deprecated and are usually disabled in libcurl"));
+        printf(" %s\n", "--sni");
+        printf("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+#       if LIBCURL_VERSION_NUM >= 0x071801
+        printf("    %s\n", _("Note: --sni is the default in libcurl as SSLv2 and SSLV3 are deprecated and"));
+        printf("    %s\n", _("      SNI only really works since TLSv1.0"));
+#       else
+        printf("    %s\n", _("Note: SNI is not supported in libcurl before 7.18.1"));
+#       endif
+        printf(" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
+        printf("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443."));
+        printf("    %s\n", _("A STATE_WARNING is returned if the certificate has a validity less than the"));
+        printf("    %s\n", _("first agument's value. If there is a second argument and the certificate's"));
+        printf("    %s\n", _("validity is less than its value, a STATE_CRITICAL is returned."));
+        printf("    %s\n", _("(When this option is used the URL is not checked by default. You can use"));
+        printf("    %s\n", _(" --continue-after-certificate to override this behavior)"));
+        printf(" %s\n", "--continue-after-certificate");
+        printf("    %s\n", _("Allows the HTTP check to continue after performing the certificate check."));
+        printf("    %s\n", _("Does nothing unless -C is used."));
+        printf(" %s\n", "-J, --client-cert=FILE");
+        printf("   %s\n", _("Name of file that contains the client certificate (PEM format)"));
+        printf("   %s\n", _("to be used in establishing the SSL session"));
+        printf(" %s\n", "-K, --private-key=FILE");
+        printf("   %s\n", _("Name of file containing the private key (PEM format)"));
+        printf("   %s\n", _("matching the client certificate"));
+        printf(" %s\n", "--ca-cert=FILE");
+        printf("   %s\n", _("CA certificate file to verify peer against"));
+        printf(" %s\n", "-D, --verify-cert");
+        printf("   %s\n", _("Verify the peer's SSL certificate and hostname"));
 #endif
 
-  printf (" %s\n", "-e, --expect=STRING");
-  printf ("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
-  printf ("    %s", _("the first (status) line of the server response (default: "));
-  printf ("%s)\n", HTTP_EXPECT);
-  printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
-  printf (" %s\n", "-d, --header-string=STRING");
-  printf ("    %s\n", _("String to expect in the response headers"));
-  printf (" %s\n", "-s, --string=STRING");
-  printf ("    %s\n", _("String to expect in the content"));
-  printf (" %s\n", "-u, --url=PATH");
-  printf ("    %s\n", _("URL to GET or POST (default: /)"));
-  printf (" %s\n", "-P, --post=STRING");
-  printf ("    %s\n", _("URL decoded http POST data"));
-  printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");
-  printf ("    %s\n", _("Set HTTP method."));
-  printf (" %s\n", "-N, --no-body");
-  printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));
-  printf ("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
-  printf (" %s\n", "-M, --max-age=SECONDS");
-  printf ("    %s\n", _("Warn if document is more than SECONDS old. the number can also be of"));
-  printf ("    %s\n", _("the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."));
-  printf (" %s\n", "-T, --content-type=STRING");
-  printf ("    %s\n", _("specify Content-Type header media type when POSTing\n"));
-  printf (" %s\n", "-l, --linespan");
-  printf ("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
-  printf (" %s\n", "-r, --regex, --ereg=STRING");
-  printf ("    %s\n", _("Search page for regex STRING"));
-  printf (" %s\n", "-R, --eregi=STRING");
-  printf ("    %s\n", _("Search page for case-insensitive regex STRING"));
-  printf (" %s\n", "--invert-regex");
-  printf ("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
-  printf ("    %s\n", _("can be changed with --state--regex)"));
-  printf (" %s\n", "--state-regex=STATE");
-  printf ("    %s\n", _("Return STATE if regex is found, OK if not. STATE can be one of \"critical\",\"warning\""));
-  printf (" %s\n", "-a, --authorization=AUTH_PAIR");
-  printf ("    %s\n", _("Username:password on sites with basic authentication"));
-  printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
-  printf ("    %s\n", _("Username:password on proxy-servers with basic authentication"));
-  printf (" %s\n", "-A, --useragent=STRING");
-  printf ("    %s\n", _("String to be sent in http header as \"User Agent\""));
-  printf (" %s\n", "-k, --header=STRING");
-  printf ("    %s\n", _("Any other tags to be sent in http header. Use multiple times for additional headers"));
-  printf (" %s\n", "-E, --extended-perfdata");
-  printf ("    %s\n", _("Print additional performance data"));
-  printf (" %s\n", "-B, --show-body");
-  printf ("    %s\n", _("Print body content below status line"));
-  printf (" %s\n", "-L, --link");
-  printf ("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
-  printf (" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky|stickyport|curl>");
-  printf ("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
-  printf ("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
-  printf ("    %s\n", _("follow uses the old redirection algorithm of check_http."));
-  printf ("    %s\n", _("curl uses CURL_FOLLOWLOCATION built into libcurl."));
-  printf (" %s\n", "--max-redirs=INTEGER");
-  printf ("    %s", _("Maximal number of redirects (default: "));
-  printf ("%d)\n", DEFAULT_MAX_REDIRS);
-  printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
-  printf ("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
-  printf ("\n");
-  printf (" %s\n", "--http-version=VERSION");
-  printf ("    %s\n", _("Connect via specific HTTP protocol."));
-  printf ("    %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
-  printf (" %s\n", "--enable-automatic-decompression");
-  printf ("    %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
-  printf(" %s\n", "--haproxy-protocol");
-  printf("    %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL)."));
-  printf (" %s\n", "--cookie-jar=FILE");
-  printf ("    %s\n", _("Store cookies in the cookie jar and send them out when requested."));
-  printf ("\n");
-
-  printf (UT_WARN_CRIT);
-
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("This plugin will attempt to open an HTTP connection with the host."));
-  printf (" %s\n", _("Successful connects return STATE_OK, refusals and timeouts return STATE_CRITICAL"));
-  printf (" %s\n", _("other errors return STATE_UNKNOWN.  Successful connects, but incorrect response"));
-  printf (" %s\n", _("messages from the host result in STATE_WARNING return values.  If you are"));
-  printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
-  printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
+        printf("    %s", _("the first (status) line of the server response (default: "));
+        printf("%s)\n", HTTP_EXPECT);
+        printf("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
+        printf(" %s\n", "-d, --header-string=STRING");
+        printf("    %s\n", _("String to expect in the response headers"));
+        printf(" %s\n", "-s, --string=STRING");
+        printf("    %s\n", _("String to expect in the content"));
+        printf(" %s\n", "-u, --url=PATH");
+        printf("    %s\n", _("URL to GET or POST (default: /)"));
+        printf(" %s\n", "-P, --post=STRING");
+        printf("    %s\n", _("URL decoded http POST data"));
+        printf(" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");
+        printf("    %s\n", _("Set HTTP method."));
+        printf(" %s\n", "-N, --no-body");
+        printf("    %s\n", _("Don't wait for document body: stop reading after headers."));
+        printf("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
+        printf(" %s\n", "-M, --max-age=SECONDS");
+        printf("    %s\n", _("Warn if document is more than SECONDS old. the number can also be of"));
+        printf("    %s\n", _("the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."));
+        printf(" %s\n", "-T, --content-type=STRING");
+        printf("    %s\n", _("specify Content-Type header media type when POSTing\n"));
+        printf(" %s\n", "-l, --linespan");
+        printf("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
+        printf(" %s\n", "-r, --regex, --ereg=STRING");
+        printf("    %s\n", _("Search page for regex STRING"));
+        printf(" %s\n", "-R, --eregi=STRING");
+        printf("    %s\n", _("Search page for case-insensitive regex STRING"));
+        printf(" %s\n", "--invert-regex");
+        printf("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
+        printf("    %s\n", _("can be changed with --state--regex)"));
+        printf(" %s\n", "--state-regex=STATE");
+        printf("    %s\n", _("Return STATE if regex is found, OK if not. STATE can be one of \"critical\",\"warning\""));
+        printf(" %s\n", "-a, --authorization=AUTH_PAIR");
+        printf("    %s\n", _("Username:password on sites with basic authentication"));
+        printf(" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
+        printf("    %s\n", _("Username:password on proxy-servers with basic authentication"));
+        printf(" %s\n", "-A, --useragent=STRING");
+        printf("    %s\n", _("String to be sent in http header as \"User Agent\""));
+        printf(" %s\n", "-k, --header=STRING");
+        printf("    %s\n", _("Any other tags to be sent in http header. Use multiple times for additional headers"));
+        printf(" %s\n", "-E, --extended-perfdata");
+        printf("    %s\n", _("Print additional performance data"));
+        printf(" %s\n", "-B, --show-body");
+        printf("    %s\n", _("Print body content below status line"));
+        printf(" %s\n", "-L, --link");
+        printf("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
+        printf(" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky|stickyport|curl>");
+        printf("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
+        printf("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
+        printf("    %s\n", _("follow uses the old redirection algorithm of check_http."));
+        printf("    %s\n", _("curl uses CURL_FOLLOWLOCATION built into libcurl."));
+        printf(" %s\n", "--max-redirs=INTEGER");
+        printf("    %s", _("Maximal number of redirects (default: "));
+        printf("%d)\n", DEFAULT_MAX_REDIRS);
+        printf(" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
+        printf("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
+        printf("\n");
+        printf(" %s\n", "--http-version=VERSION");
+        printf("    %s\n", _("Connect via specific HTTP protocol."));
+        printf("    %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
+        printf(" %s\n", "--enable-automatic-decompression");
+        printf("    %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
+        printf(" %s\n", "--haproxy-protocol");
+        printf("    %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL)."));
+        printf(" %s\n", "--cookie-jar=FILE");
+        printf("    %s\n", _("Store cookies in the cookie jar and send them out when requested."));
+        printf("\n");
+
+        printf(UT_WARN_CRIT);
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_VERBOSE);
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("This plugin will attempt to open an HTTP connection with the host."));
+        printf(" %s\n", _("Successful connects return STATE_OK, refusals and timeouts return STATE_CRITICAL"));
+        printf(" %s\n", _("other errors return STATE_UNKNOWN.  Successful connects, but incorrect response"));
+        printf(" %s\n", _("messages from the host result in STATE_WARNING return values.  If you are"));
+        printf(" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
+        printf(" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
 
 #ifdef LIBCURL_FEATURE_SSL
-  printf ("\n");
-  printf (" %s\n", _("This plugin can also check whether an SSL enabled web server is able to"));
-  printf (" %s\n", _("serve content (optionally within a specified time) or whether the X509 "));
-  printf (" %s\n", _("certificate is still valid for the specified number of days."));
-  printf ("\n");
-  printf (" %s\n", _("Please note that this plugin does not check if the presented server"));
-  printf (" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
-  printf (" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n\n", "CHECK CONTENT: check_curl -w 5 -c 10 --ssl -H www.verisign.com");
-  printf (" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));
-  printf (" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
-  printf (" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
-  printf (" %s\n", _("a STATE_CRITICAL will be returned."));
-  printf ("\n");
-  printf (" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 14");
-  printf (" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
-  printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
-  printf (" %s\n", _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
-  printf (" %s\n\n", _("the certificate is expired."));
-  printf ("\n");
-  printf (" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 30,14");
-  printf (" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
-  printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
-  printf (" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
-  printf (" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
+        printf("\n");
+        printf(" %s\n", _("This plugin can also check whether an SSL enabled web server is able to"));
+        printf(" %s\n", _("serve content (optionally within a specified time) or whether the X509 "));
+        printf(" %s\n", _("certificate is still valid for the specified number of days."));
+        printf("\n");
+        printf(" %s\n", _("Please note that this plugin does not check if the presented server"));
+        printf(" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
+        printf(" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n\n", "CHECK CONTENT: check_curl -w 5 -c 10 --ssl -H www.verisign.com");
+        printf(" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));
+        printf(" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
+        printf(" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
+        printf(" %s\n", _("a STATE_CRITICAL will be returned."));
+        printf("\n");
+        printf(" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 14");
+        printf(" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
+        printf(" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+        printf(" %s\n", _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
+        printf(" %s\n\n", _("the certificate is expired."));
+        printf("\n");
+        printf(" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 30,14");
+        printf(" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
+        printf(" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+        printf(" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
+        printf(" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
 #endif
 
-  printf ("\n %s\n", "CHECK WEBSERVER CONTENT VIA PROXY:");
-  printf (" %s\n", _("It is recommended to use an environment proxy like:"));
-  printf (" %s\n", _("http_proxy=http://192.168.100.35:3128 ./check_curl -H www.monitoring-plugins.org"));
-  printf (" %s\n", _("legacy proxy requests in check_http style still work:"));
-  printf (" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u http://www.monitoring-plugins.org/ -H www.monitoring-plugins.org"));
+        printf("\n %s\n", "CHECK WEBSERVER CONTENT VIA PROXY:");
+        printf(" %s\n", _("It is recommended to use an environment proxy like:"));
+        printf(" %s\n", _("http_proxy=http://192.168.100.35:3128 ./check_curl -H www.monitoring-plugins.org"));
+        printf(" %s\n", _("legacy proxy requests in check_http style still work:"));
+        printf(" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u http://www.monitoring-plugins.org/ -H www.monitoring-plugins.org"));
 
 #ifdef LIBCURL_FEATURE_SSL
-  printf ("\n %s\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
-  printf (" %s\n", _("It is recommended to use an environment proxy like:"));
-  printf (" %s\n", _("https_proxy=http://192.168.100.35:3128 ./check_curl -H www.verisign.com -S"));
-  printf (" %s\n", _("legacy proxy requests in check_http style still work:"));
-  printf (" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com "));
-  printf (" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>"));
-  printf (" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
-  printf (" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
-  printf (" %s\n", _("a STATE_CRITICAL will be returned."));
+        printf("\n %s\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
+        printf(" %s\n", _("It is recommended to use an environment proxy like:"));
+        printf(" %s\n", _("https_proxy=http://192.168.100.35:3128 ./check_curl -H www.verisign.com -S"));
+        printf(" %s\n", _("legacy proxy requests in check_http style still work:"));
+        printf(" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com "));
+        printf(" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>"));
+        printf(" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
+        printf(" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
+        printf(" %s\n", _("a STATE_CRITICAL will be returned."));
 
 #endif
 
-  printf (UT_SUPPORT);
-
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
-  printf ("       [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate file>] [-D]\n");
-  printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
-  printf ("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n");
-  printf ("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
-  printf ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
-  printf ("       [-A string] [-k string] [-S <version>] [--sni] [--haproxy-protocol]\n");
-  printf ("       [-T <content-type>] [-j method]\n");
-  printf ("       [--http-version=<version>] [--enable-automatic-decompression]\n");
-  printf ("       [--cookie-jar=<cookie jar file>\n");
-  printf (" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n",progname);
-  printf ("       [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
-  printf ("\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n", progname);
+        printf("       [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate file>] [-D]\n");
+        printf("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
+        printf("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n");
+        printf("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
+        printf("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
+        printf("       [-A string] [-k string] [-S <version>] [--sni] [--haproxy-protocol]\n");
+        printf("       [-T <content-type>] [-j method]\n");
+        printf("       [--http-version=<version>] [--enable-automatic-decompression]\n");
+        printf("       [--cookie-jar=<cookie jar file>\n");
+        printf(" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n", progname);
+        printf("       [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
+        printf("\n");
 #ifdef LIBCURL_FEATURE_SSL
-  printf ("%s\n", _("In the first form, make an HTTP request."));
-  printf ("%s\n\n", _("In the second form, connect to the server and check the TLS certificate."));
+        printf("%s\n", _("In the first form, make an HTTP request."));
+        printf("%s\n\n", _("In the second form, connect to the server and check the TLS certificate."));
 #endif
 }
 
-void
-print_curl_version (void)
-{
-  printf( "%s\n", curl_version());
-}
+void print_curl_version(void) { printf("%s\n", curl_version()); }
 
-int
-curlhelp_initwritebuffer (curlhelp_write_curlbuf *buf)
-{
-  buf->bufsize = DEFAULT_BUFFER_SIZE;
-  buf->buflen = 0;
-  buf->buf = (char *)malloc ((size_t)buf->bufsize);
-  if (buf->buf == NULL) return -1;
-  return 0;
+int curlhelp_initwritebuffer(curlhelp_write_curlbuf *buf) {
+        buf->bufsize = DEFAULT_BUFFER_SIZE;
+        buf->buflen = 0;
+        buf->buf = (char *)malloc((size_t)buf->bufsize);
+        if (buf->buf == NULL)
+                return -1;
+        return 0;
 }
 
-size_t curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *stream)
-{
-  curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream;
+size_t curlhelp_buffer_write_callback(void *buffer, size_t size, size_t nmemb, void *stream) {
+        curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream;
 
-  while (buf->bufsize < buf->buflen + size * nmemb + 1) {
-    buf->bufsize = buf->bufsize * 2;
-    buf->buf = (char *)realloc (buf->buf, buf->bufsize);
-    if (buf->buf == NULL) {
-      fprintf(stderr, "malloc failed (%d) %s\n", errno, strerror(errno));
-      return -1;
-    }
-  }
+        while (buf->bufsize < buf->buflen + size * nmemb + 1) {
+                buf->bufsize = buf->bufsize * 2;
+                buf->buf = (char *)realloc(buf->buf, buf->bufsize);
+                if (buf->buf == NULL) {
+                        fprintf(stderr, "malloc failed (%d) %s\n", errno, strerror(errno));
+                        return -1;
+                }
+        }
 
-  memcpy (buf->buf + buf->buflen, buffer, size * nmemb);
-  buf->buflen += size * nmemb;
-  buf->buf[buf->buflen] = '\0';
+        memcpy(buf->buf + buf->buflen, buffer, size * nmemb);
+        buf->buflen += size * nmemb;
+        buf->buf[buf->buflen] = '\0';
 
-  return (int)(size * nmemb);
+        return (int)(size * nmemb);
 }
 
-size_t curlhelp_buffer_read_callback(void *buffer, size_t size, size_t nmemb, void *stream)
-{
-  curlhelp_read_curlbuf *buf = (curlhelp_read_curlbuf *)stream;
+size_t curlhelp_buffer_read_callback(void *buffer, size_t size, size_t nmemb, void *stream) {
+        curlhelp_read_curlbuf *buf = (curlhelp_read_curlbuf *)stream;
 
-  size_t n = min (nmemb * size, buf->buflen - buf->pos);
+        size_t n = min(nmemb * size, buf->buflen - buf->pos);
 
-  memcpy (buffer, buf->buf + buf->pos, n);
-  buf->pos += n;
+        memcpy(buffer, buf->buf + buf->pos, n);
+        buf->pos += n;
 
-  return (int)n;
+        return (int)n;
 }
 
-void
-curlhelp_freewritebuffer (curlhelp_write_curlbuf *buf)
-{
-  free (buf->buf);
-  buf->buf = NULL;
+void curlhelp_freewritebuffer(curlhelp_write_curlbuf *buf) {
+        free(buf->buf);
+        buf->buf = NULL;
 }
 
-int
-curlhelp_initreadbuffer (curlhelp_read_curlbuf *buf, const char *data, size_t datalen)
-{
-  buf->buflen = datalen;
-  buf->buf = (char *)malloc ((size_t)buf->buflen);
-  if (buf->buf == NULL) return -1;
-  memcpy (buf->buf, data, datalen);
-  buf->pos = 0;
-  return 0;
+int curlhelp_initreadbuffer(curlhelp_read_curlbuf *buf, const char *data, size_t datalen) {
+        buf->buflen = datalen;
+        buf->buf = (char *)malloc((size_t)buf->buflen);
+        if (buf->buf == NULL)
+                return -1;
+        memcpy(buf->buf, data, datalen);
+        buf->pos = 0;
+        return 0;
 }
 
-void
-curlhelp_freereadbuffer (curlhelp_read_curlbuf *buf)
-{
-  free (buf->buf);
-  buf->buf = NULL;
+void curlhelp_freereadbuffer(curlhelp_read_curlbuf *buf) {
+        free(buf->buf);
+        buf->buf = NULL;
 }
 
 /* TODO: where to put this, it's actually part of sstrings2 (logically)?
  */
-const char*
-strrstr2(const char *haystack, const char *needle)
-{
-  int counter;
-  size_t len;
-  const char *prev_pos;
-  const char *pos;
-
-  if (haystack == NULL || needle == NULL)
-    return NULL;
-
-  if (haystack[0] == '\0' || needle[0] == '\0')
-    return NULL;
-
-  counter = 0;
-  prev_pos = NULL;
-  pos = haystack;
-  len = strlen (needle);
-  for (;;) {
-    pos = strstr (pos, needle);
-    if (pos == NULL) {
-      if (counter == 0)
-        return NULL;
-      else
-        return prev_pos;
-    }
-    counter++;
-    prev_pos = pos;
-    pos += len;
-    if (*pos == '\0') return prev_pos;
-  }
+const char *strrstr2(const char *haystack, const char *needle) {
+        int counter;
+        size_t len;
+        const char *prev_pos;
+        const char *pos;
+
+        if (haystack == NULL || needle == NULL)
+                return NULL;
+
+        if (haystack[0] == '\0' || needle[0] == '\0')
+                return NULL;
+
+        counter = 0;
+        prev_pos = NULL;
+        pos = haystack;
+        len = strlen(needle);
+        for (;;) {
+                pos = strstr(pos, needle);
+                if (pos == NULL) {
+                        if (counter == 0)
+                                return NULL;
+                        return prev_pos;
+                }
+                counter++;
+                prev_pos = pos;
+                pos += len;
+                if (*pos == '\0')
+                        return prev_pos;
+        }
 }
 
-int
-curlhelp_parse_statusline (const char *buf, curlhelp_statusline *status_line)
-{
-  char *first_line_end;
-  char *p;
-  size_t first_line_len;
-  char *pp;
-  const char *start;
-  char *first_line_buf;
-
-  /* find last start of a new header */
-  start = strrstr2 (buf, "\r\nHTTP/");
-  if (start != NULL) {
-    start += 2;
-    buf = start;
-  }
-
-  first_line_end = strstr(buf, "\r\n");
-  if (first_line_end == NULL) return -1;
-
-  first_line_len = (size_t)(first_line_end - buf);
-  status_line->first_line = (char *)malloc (first_line_len + 1);
-  if (status_line->first_line == NULL) return -1;
-  memcpy (status_line->first_line, buf, first_line_len);
-  status_line->first_line[first_line_len] = '\0';
-  first_line_buf = strdup( status_line->first_line );
-
-  /* protocol and version: "HTTP/x.x" SP or "HTTP/2" SP */
-
-  p = strtok(first_line_buf, "/");
-  if( p == NULL ) { free( first_line_buf ); return -1; }
-  if( strcmp( p, "HTTP" ) != 0 ) { free( first_line_buf ); return -1; }
-
-  p = strtok( NULL, " " );
-  if( p == NULL ) { free( first_line_buf ); return -1; }
-  if( strchr( p, '.' ) != NULL ) {
-
-    /* HTTP 1.x case */
-    strtok( p, "." );
-    status_line->http_major = (int)strtol( p, &pp, 10 );
-    if( *pp != '\0' ) { free( first_line_buf ); return -1; }
-    strtok( NULL, " " );
-    status_line->http_minor = (int)strtol( p, &pp, 10 );
-    if( *pp != '\0' ) { free( first_line_buf ); return -1; }
-    p += 4; /* 1.x SP */
-  } else {
-    /* HTTP 2 case */
-    status_line->http_major = (int)strtol( p, &pp, 10 );
-    status_line->http_minor = 0;
-    p += 2; /* 2 SP */
-  }
-
-  /* status code: "404" or "404.1", then SP */
-
-  p = strtok( p, " " );
-  if( p == NULL ) { free( first_line_buf ); return -1; }
-  if( strchr( p, '.' ) != NULL ) {
-    char *ppp;
-    ppp = strtok( p, "." );
-    status_line->http_code = (int)strtol( ppp, &pp, 10 );
-    if( *pp != '\0' ) { free( first_line_buf ); return -1; }
-    ppp = strtok( NULL, "" );
-    status_line->http_subcode = (int)strtol( ppp, &pp, 10 );
-    if( *pp != '\0' ) { free( first_line_buf ); return -1; }
-    p += 6; /* 400.1 SP */
-  } else {
-    status_line->http_code = (int)strtol( p, &pp, 10 );
-    status_line->http_subcode = -1;
-    if( *pp != '\0' ) { free( first_line_buf ); return -1; }
-    p += 4; /* 400 SP */
-  }
-
-  /* Human readable message: "Not Found" CRLF */
-
-  p = strtok( p, "" );
-  if( p == NULL ) { status_line->msg = ""; return 0; }
-  status_line->msg = status_line->first_line + ( p - first_line_buf );
-  free( first_line_buf );
-
-  return 0;
-}
+int curlhelp_parse_statusline(const char *buf, curlhelp_statusline *status_line) {
+        char *first_line_end;
+        char *p;
+        size_t first_line_len;
+        char *pp;
+        const char *start;
+        char *first_line_buf;
+
+        /* find last start of a new header */
+        start = strrstr2(buf, "\r\nHTTP/");
+        if (start != NULL) {
+                start += 2;
+                buf = start;
+        }
 
-void
-curlhelp_free_statusline (curlhelp_statusline *status_line)
-{
-  free (status_line->first_line);
-}
+        first_line_end = strstr(buf, "\r\n");
+        if (first_line_end == NULL)
+                return -1;
+
+        first_line_len = (size_t)(first_line_end - buf);
+        status_line->first_line = (char *)malloc(first_line_len + 1);
+        if (status_line->first_line == NULL)
+                return -1;
+        memcpy(status_line->first_line, buf, first_line_len);
+        status_line->first_line[first_line_len] = '\0';
+        first_line_buf = strdup(status_line->first_line);
+
+        /* protocol and version: "HTTP/x.x" SP or "HTTP/2" SP */
+
+        p = strtok(first_line_buf, "/");
+        if (p == NULL) {
+                free(first_line_buf);
+                return -1;
+        }
+        if (strcmp(p, "HTTP") != 0) {
+                free(first_line_buf);
+                return -1;
+        }
+
+        p = strtok(NULL, " ");
+        if (p == NULL) {
+                free(first_line_buf);
+                return -1;
+        }
+        if (strchr(p, '.') != NULL) {
+
+                /* HTTP 1.x case */
+                strtok(p, ".");
+                status_line->http_major = (int)strtol(p, &pp, 10);
+                if (*pp != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                strtok(NULL, " ");
+                status_line->http_minor = (int)strtol(p, &pp, 10);
+                if (*pp != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                p += 4; /* 1.x SP */
+        } else {
+                /* HTTP 2 case */
+                status_line->http_major = (int)strtol(p, &pp, 10);
+                status_line->http_minor = 0;
+                p += 2; /* 2 SP */
+        }
 
-void
-remove_newlines (char *s)
-{
-  char *p;
+        /* status code: "404" or "404.1", then SP */
 
-  for (p = s; *p != '\0'; p++)
-    if (*p == '\r' || *p == '\n')
-      *p = ' ';
+        p = strtok(p, " ");
+        if (p == NULL) {
+                free(first_line_buf);
+                return -1;
+        }
+        if (strchr(p, '.') != NULL) {
+                char *ppp;
+                ppp = strtok(p, ".");
+                status_line->http_code = (int)strtol(ppp, &pp, 10);
+                if (*pp != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                ppp = strtok(NULL, "");
+                status_line->http_subcode = (int)strtol(ppp, &pp, 10);
+                if (*pp != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                p += 6; /* 400.1 SP */
+        } else {
+                status_line->http_code = (int)strtol(p, &pp, 10);
+                status_line->http_subcode = -1;
+                if (*pp != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                p += 4; /* 400 SP */
+        }
+
+        /* Human readable message: "Not Found" CRLF */
+
+        p = strtok(p, "");
+        if (p == NULL) {
+                status_line->msg = "";
+                return 0;
+        }
+        status_line->msg = status_line->first_line + (p - first_line_buf);
+        free(first_line_buf);
+
+        return 0;
 }
 
-char *
-get_header_value (const struct phr_header* headers, const size_t nof_headers, const char* header)
-{
-  for(size_t i = 0; i < nof_headers; i++ ) {
-    if(headers[i].name != NULL && strncasecmp( header, headers[i].name, max( headers[i].name_len, 4 ) ) == 0 ) {
-      return strndup( headers[i].value, headers[i].value_len );
-    }
-  }
-  return NULL;
+void curlhelp_free_statusline(curlhelp_statusline *status_line) { free(status_line->first_line); }
+
+char *get_header_value(const struct phr_header *headers, const size_t nof_headers, const char *header) {
+        for (size_t i = 0; i < nof_headers; i++) {
+                if (headers[i].name != NULL && strncasecmp(header, headers[i].name, max(headers[i].name_len, 4)) == 0) {
+                        return strndup(headers[i].value, headers[i].value_len);
+                }
+        }
+        return NULL;
 }
 
-int
-check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFAULT_BUFFER_SIZE])
-{
-  char *server_date = NULL;
-  char *document_date = NULL;
-  int date_result = STATE_OK;
-  curlhelp_statusline status_line;
-  struct phr_header headers[255];
-  size_t nof_headers = 255;
-  size_t msglen;
-
-  int res = phr_parse_response (header_buf->buf, header_buf->buflen,
-    &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen,
-    headers, &nof_headers, 0);
+int check_document_dates(const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFAULT_BUFFER_SIZE]) {
+        char *server_date = NULL;
+        char *document_date = NULL;
+        int date_result = STATE_OK;
+        curlhelp_statusline status_line;
+        struct phr_header headers[255];
+        size_t nof_headers = 255;
+        size_t msglen;
+
+        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major, &status_line.http_minor,
+                                                                 &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0);
 
         if (res == -1) {
-                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
         }
 
-  server_date = get_header_value (headers, nof_headers, "date");
-  document_date = get_header_value (headers, nof_headers, "last-modified");
+        server_date = get_header_value(headers, nof_headers, "date");
+        document_date = get_header_value(headers, nof_headers, "last-modified");
 
         if (!server_date || !*server_date) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sServer date unknown, "), *msg);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sServer date unknown, "), *msg);
                 strcpy(*msg, tmp);
 
                 date_result = max_state_alt(STATE_UNKNOWN, date_result);
@@ -2457,34 +2348,34 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
         } else if (!document_date || !*document_date) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sDocument modification date unknown, "), *msg);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sDocument modification date unknown, "), *msg);
                 strcpy(*msg, tmp);
 
                 date_result = max_state_alt(STATE_CRITICAL, date_result);
 
-  } else {
-    time_t srv_data = curl_getdate (server_date, NULL);
-    time_t doc_data = curl_getdate (document_date, NULL);
-    if (verbose >= 2)
-      printf ("* server date: '%s' (%d), doc_date: '%s' (%d)\n", server_date, (int)srv_data, document_date, (int)doc_data);
+        } else {
+                time_t srv_data = curl_getdate(server_date, NULL);
+                time_t doc_data = curl_getdate(document_date, NULL);
+                if (verbose >= 2)
+                        printf("* server date: '%s' (%d), doc_date: '%s' (%d)\n", server_date, (int)srv_data, document_date, (int)doc_data);
                 if (srv_data <= 0) {
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sServer date \"%100s\" unparsable, "), *msg, server_date);
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sServer date \"%100s\" unparsable, "), *msg, server_date);
                         strcpy(*msg, tmp);
 
                         date_result = max_state_alt(STATE_CRITICAL, date_result);
                 } else if (doc_data <= 0) {
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sDocument date \"%100s\" unparsable, "), *msg, document_date);
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sDocument date \"%100s\" unparsable, "), *msg, document_date);
                         strcpy(*msg, tmp);
 
                         date_result = max_state_alt(STATE_CRITICAL, date_result);
                 } else if (doc_data > srv_data + 30) {
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sDocument is %d seconds in the future, "), *msg, (int)doc_data - (int)srv_data);
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sDocument is %d seconds in the future, "), *msg, (int)doc_data - (int)srv_data);
                         strcpy(*msg, tmp);
 
                         date_result = max_state_alt(STATE_CRITICAL, date_result);
@@ -2493,14 +2384,14 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
                         if (n > (60 * 60 * 24 * 2)) {
                                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sLast modified %.1f days ago, "), *msg, ((float) n) / (60 * 60 * 24));
-                        strcpy(*msg, tmp);
+                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sLast modified %.1f days ago, "), *msg, ((float)n) / (60 * 60 * 24));
+                                strcpy(*msg, tmp);
 
                                 date_result = max_state_alt(STATE_CRITICAL, date_result);
                         } else {
                                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sLast modified %d:%02d:%02d ago, "), *msg, n / (60 * 60), (n / 60) % 60, n % 60);
+                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sLast modified %d:%02d:%02d ago, "), *msg, n / (60 * 60), (n / 60) % 60, n % 60);
                                 strcpy(*msg, tmp);
 
                                 date_result = max_state_alt(STATE_CRITICAL, date_result);
@@ -2508,132 +2399,128 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
                 }
         }
 
-  if (server_date) free (server_date);
-  if (document_date) free (document_date);
+        if (server_date)
+                free(server_date);
+        if (document_date)
+                free(document_date);
 
-  return date_result;
+        return date_result;
 }
 
+int get_content_length(const curlhelp_write_curlbuf *header_buf, const curlhelp_write_curlbuf *body_buf) {
+        size_t content_length = 0;
+        struct phr_header headers[255];
+        size_t nof_headers = 255;
+        size_t msglen;
+        char *content_length_s = NULL;
+        curlhelp_statusline status_line;
 
-int
-get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_write_curlbuf* body_buf)
-{
-  size_t content_length = 0;
-  struct phr_header headers[255];
-  size_t nof_headers = 255;
-  size_t msglen;
-  char *content_length_s = NULL;
-  curlhelp_statusline status_line;
-
-  int res = phr_parse_response (header_buf->buf, header_buf->buflen,
-    &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen,
-    headers, &nof_headers, 0);
+        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major, &status_line.http_minor,
+                                                                 &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0);
 
         if (res == -1) {
-                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
         }
 
-  content_length_s = get_header_value (headers, nof_headers, "content-length");
-  if (!content_length_s) {
-    return header_buf->buflen + body_buf->buflen;
-  }
-  content_length_s += strspn (content_length_s, " \t");
-  content_length = atoi (content_length_s);
-  if (content_length != body_buf->buflen) {
-    /* TODO: should we warn if the actual and the reported body length don't match? */
-  }
+        content_length_s = get_header_value(headers, nof_headers, "content-length");
+        if (!content_length_s) {
+                return header_buf->buflen + body_buf->buflen;
+        }
+        content_length_s += strspn(content_length_s, " \t");
+        content_length = atoi(content_length_s);
+        if (content_length != body_buf->buflen) {
+                /* TODO: should we warn if the actual and the reported body length don't match? */
+        }
 
-  if (content_length_s) free (content_length_s);
+        if (content_length_s)
+                free(content_length_s);
 
-  return header_buf->buflen + body_buf->buflen;
+        return header_buf->buflen + body_buf->buflen;
 }
 
 /* TODO: is there a better way in libcurl to check for the SSL library? */
-curlhelp_ssl_library
-curlhelp_get_ssl_library ()
-{
-  curl_version_info_data* version_data;
-  char *ssl_version;
-  char *library;
-  curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-  version_data = curl_version_info (CURLVERSION_NOW);
-  if (version_data == NULL) return CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-  ssl_version = strdup (version_data->ssl_version);
-  if (ssl_version == NULL ) return CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-  library = strtok (ssl_version, "/");
-  if (library == NULL) return CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-  if (strcmp (library, "OpenSSL") == 0)
-    ssl_library = CURLHELP_SSL_LIBRARY_OPENSSL;
-  else if (strcmp (library, "LibreSSL") == 0)
-    ssl_library = CURLHELP_SSL_LIBRARY_LIBRESSL;
-  else if (strcmp (library, "GnuTLS") == 0)
-    ssl_library = CURLHELP_SSL_LIBRARY_GNUTLS;
-  else if (strcmp (library, "NSS") == 0)
-    ssl_library = CURLHELP_SSL_LIBRARY_NSS;
-
-  if (verbose >= 2)
-    printf ("* SSL library string is : %s %s (%d)\n", version_data->ssl_version, library, ssl_library);
-
-  free (ssl_version);
-
-  return ssl_library;
+curlhelp_ssl_library curlhelp_get_ssl_library(void) {
+        curl_version_info_data *version_data;
+        char *ssl_version;
+        char *library;
+        curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
+
+        version_data = curl_version_info(CURLVERSION_NOW);
+        if (version_data == NULL)
+                return CURLHELP_SSL_LIBRARY_UNKNOWN;
+
+        ssl_version = strdup(version_data->ssl_version);
+        if (ssl_version == NULL)
+                return CURLHELP_SSL_LIBRARY_UNKNOWN;
+
+        library = strtok(ssl_version, "/");
+        if (library == NULL)
+                return CURLHELP_SSL_LIBRARY_UNKNOWN;
+
+        if (strcmp(library, "OpenSSL") == 0)
+                ssl_library = CURLHELP_SSL_LIBRARY_OPENSSL;
+        else if (strcmp(library, "LibreSSL") == 0)
+                ssl_library = CURLHELP_SSL_LIBRARY_LIBRESSL;
+        else if (strcmp(library, "GnuTLS") == 0)
+                ssl_library = CURLHELP_SSL_LIBRARY_GNUTLS;
+        else if (strcmp(library, "NSS") == 0)
+                ssl_library = CURLHELP_SSL_LIBRARY_NSS;
+
+        if (verbose >= 2)
+                printf("* SSL library string is : %s %s (%d)\n", version_data->ssl_version, library, ssl_library);
+
+        free(ssl_version);
+
+        return ssl_library;
 }
 
-const char*
-curlhelp_get_ssl_library_string (curlhelp_ssl_library ssl_library)
-{
-  switch (ssl_library) {
-    case CURLHELP_SSL_LIBRARY_OPENSSL:
-      return "OpenSSL";
-    case CURLHELP_SSL_LIBRARY_LIBRESSL:
-      return "LibreSSL";
-    case CURLHELP_SSL_LIBRARY_GNUTLS:
-      return "GnuTLS";
-    case CURLHELP_SSL_LIBRARY_NSS:
-      return "NSS";
-    case CURLHELP_SSL_LIBRARY_UNKNOWN:
-    default:
-      return "unknown";
-  }
+const char *curlhelp_get_ssl_library_string(curlhelp_ssl_library ssl_library) {
+        switch (ssl_library) {
+        case CURLHELP_SSL_LIBRARY_OPENSSL:
+                return "OpenSSL";
+        case CURLHELP_SSL_LIBRARY_LIBRESSL:
+                return "LibreSSL";
+        case CURLHELP_SSL_LIBRARY_GNUTLS:
+                return "GnuTLS";
+        case CURLHELP_SSL_LIBRARY_NSS:
+                return "NSS";
+        case CURLHELP_SSL_LIBRARY_UNKNOWN:
+        default:
+                return "unknown";
+        }
 }
 
 #ifdef LIBCURL_FEATURE_SSL
-#ifndef USE_OPENSSL
-time_t
-parse_cert_date (const char *s)
-{
-  struct tm tm;
-  time_t date;
-  char *res;
-
-  if (!s) return -1;
-
-  /* Jan 17 14:25:12 2020 GMT */
-  res = strptime (s, "%Y-%m-%d %H:%M:%S GMT", &tm);
-  /* Sep 11 12:00:00 2020 GMT */
-  if (res == NULL) strptime (s, "%Y %m %d %H:%M:%S GMT", &tm);
-  date = mktime (&tm);
-
-  return date;
+#       ifndef USE_OPENSSL
+time_t parse_cert_date(const char *s) {
+        struct tm tm;
+        time_t date;
+        char *res;
+
+        if (!s)
+                return -1;
+
+        /* Jan 17 14:25:12 2020 GMT */
+        res = strptime(s, "%Y-%m-%d %H:%M:%S GMT", &tm);
+        /* Sep 11 12:00:00 2020 GMT */
+        if (res == NULL)
+                strptime(s, "%Y %m %d %H:%M:%S GMT", &tm);
+        date = mktime(&tm);
+
+        return date;
 }
 
 /* TODO: this needs cleanup in the sslutils.c, maybe we the #else case to
  * OpenSSL could be this function
  */
-int
-net_noopenssl_check_certificate (cert_ptr_union* cert_ptr, int days_till_exp_warn, int days_till_exp_crit)
-{
-  int i;
-  struct curl_slist* slist;
-  int cname_found = 0;
-  char* start_date_str = NULL;
-  char* end_date_str = NULL;
-  time_t start_date;
-  time_t end_date;
+int net_noopenssl_check_certificate(cert_ptr_union *cert_ptr, int days_till_exp_warn, int days_till_exp_crit) {
+        int i;
+        struct curl_slist *slist;
+        int cname_found = 0;
+        char *start_date_str = NULL;
+        char *end_date_str = NULL;
+        time_t start_date;
+        time_t end_date;
         char *tz;
         float time_left;
         int days_left;
@@ -2641,66 +2528,64 @@ net_noopenssl_check_certificate (cert_ptr_union* cert_ptr, int days_till_exp_war
         char timestamp[50] = "";
         int status = STATE_UNKNOWN;
 
-  if (verbose >= 2)
-    printf ("**** REQUEST CERTIFICATES ****\n");
-
-  for (i = 0; i < cert_ptr->to_certinfo->num_of_certs; i++) {
-    for (slist = cert_ptr->to_certinfo->certinfo[i]; slist; slist = slist->next) {
-      /* find first common name in subject,
-       * TODO: check alternative subjects for
-       * TODO: have a decent parser here and not a hack
-       * multi-host certificate, check wildcards
-       */
-      if (strncasecmp (slist->data, "Subject:", 8) == 0) {
-        int d = 3;
-        char* p = strstr (slist->data, "CN=");
-        if (p == NULL) {
-          d = 5;
-          p = strstr (slist->data, "CN = ");
-        }
-        if (p != NULL) {
-          if (strncmp (host_name, p+d, strlen (host_name)) == 0) {
-            cname_found = 1;
-          }
-        }
-      } else if (strncasecmp (slist->data, "Start Date:", 11) == 0) {
-        start_date_str = &slist->data[11];
-      } else if (strncasecmp (slist->data, "Expire Date:", 12) == 0) {
-        end_date_str = &slist->data[12];
-      } else if (strncasecmp (slist->data, "Cert:", 5) == 0) {
-        goto HAVE_FIRST_CERT;
-      }
-      if (verbose >= 2)
-        printf ("%d ** %s\n", i, slist->data);
-    }
-  }
+        if (verbose >= 2)
+                printf("**** REQUEST CERTIFICATES ****\n");
+
+        for (i = 0; i < cert_ptr->to_certinfo->num_of_certs; i++) {
+                for (slist = cert_ptr->to_certinfo->certinfo[i]; slist; slist = slist->next) {
+                        /* find first common name in subject,
+                         * TODO: check alternative subjects for
+                         * TODO: have a decent parser here and not a hack
+                         * multi-host certificate, check wildcards
+                         */
+                        if (strncasecmp(slist->data, "Subject:", 8) == 0) {
+                                int d = 3;
+                                char *p = strstr(slist->data, "CN=");
+                                if (p == NULL) {
+                                        d = 5;
+                                        p = strstr(slist->data, "CN = ");
+                                }
+                                if (p != NULL) {
+                                        if (strncmp(host_name, p + d, strlen(host_name)) == 0) {
+                                                cname_found = 1;
+                                        }
+                                }
+                        } else if (strncasecmp(slist->data, "Start Date:", 11) == 0) {
+                                start_date_str = &slist->data[11];
+                        } else if (strncasecmp(slist->data, "Expire Date:", 12) == 0) {
+                                end_date_str = &slist->data[12];
+                        } else if (strncasecmp(slist->data, "Cert:", 5) == 0) {
+                                goto HAVE_FIRST_CERT;
+                        }
+                        if (verbose >= 2)
+                                printf("%d ** %s\n", i, slist->data);
+                }
+        }
 HAVE_FIRST_CERT:
 
-  if (verbose >= 2)
-    printf ("**** REQUEST CERTIFICATES ****\n");
+        if (verbose >= 2)
+                printf("**** REQUEST CERTIFICATES ****\n");
 
-  if (!cname_found) {
-                printf("%s\n",_("CRITICAL - Cannot retrieve certificate subject."));
+        if (!cname_found) {
+                printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
                 return STATE_CRITICAL;
-  }
-
-  start_date = parse_cert_date (start_date_str);
-  if (start_date <= 0) {
-    snprintf (msg, DEFAULT_BUFFER_SIZE, _("WARNING - Unparsable 'Start Date' in certificate: '%s'"),
-      start_date_str);
-    puts (msg);
-    return STATE_WARNING;
-  }
-
-  end_date = parse_cert_date (end_date_str);
-  if (end_date <= 0) {
-    snprintf (msg, DEFAULT_BUFFER_SIZE, _("WARNING - Unparsable 'Expire Date' in certificate: '%s'"),
-      start_date_str);
-    puts (msg);
-    return STATE_WARNING;
-  }
-
-  time_left = difftime (end_date, time(NULL));
+        }
+
+        start_date = parse_cert_date(start_date_str);
+        if (start_date <= 0) {
+                snprintf(msg, DEFAULT_BUFFER_SIZE, _("WARNING - Unparsable 'Start Date' in certificate: '%s'"), start_date_str);
+                puts(msg);
+                return STATE_WARNING;
+        }
+
+        end_date = parse_cert_date(end_date_str);
+        if (end_date <= 0) {
+                snprintf(msg, DEFAULT_BUFFER_SIZE, _("WARNING - Unparsable 'Expire Date' in certificate: '%s'"), start_date_str);
+                puts(msg);
+                return STATE_WARNING;
+        }
+
+        time_left = difftime(end_date, time(NULL));
         days_left = time_left / 86400;
         tz = getenv("TZ");
         setenv("TZ", "GMT", 1);
@@ -2713,30 +2598,31 @@ HAVE_FIRST_CERT:
         tzset();
 
         if (days_left > 0 && days_left <= days_till_exp_warn) {
-                printf (_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", host_name, days_left, timestamp);
+                printf(_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL",
+                           host_name, days_left, timestamp);
                 if (days_left > days_till_exp_crit)
                         status = STATE_WARNING;
                 else
                         status = STATE_CRITICAL;
         } else if (days_left == 0 && time_left > 0) {
                 if (time_left >= 3600)
-                        time_remaining = (int) time_left / 3600;
+                        time_remaining = (int)time_left / 3600;
                 else
-                        time_remaining = (int) time_left / 60;
+                        time_remaining = (int)time_left / 60;
 
-                printf (_("%s - Certificate '%s' expires in %u %s (%s)\n"),
-                        (days_left>days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name, time_remaining,
-                        time_left >= 3600 ? "hours" : "minutes", timestamp);
+                printf(_("%s - Certificate '%s' expires in %u %s (%s)\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name,
+                           time_remaining, time_left >= 3600 ? "hours" : "minutes", timestamp);
 
-                if ( days_left > days_till_exp_crit)
+                if (days_left > days_till_exp_crit)
                         status = STATE_WARNING;
                 else
                         status = STATE_CRITICAL;
         } else if (time_left < 0) {
                 printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), host_name, timestamp);
-                status=STATE_CRITICAL;
+                status = STATE_CRITICAL;
         } else if (days_left == 0) {
-                printf (_("%s - Certificate '%s' just expired (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", host_name, timestamp);
+                printf(_("%s - Certificate '%s' just expired (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name,
+                           timestamp);
                 if (days_left > days_till_exp_crit)
                         status = STATE_WARNING;
                 else
@@ -2747,5 +2633,5 @@ HAVE_FIRST_CERT:
         }
         return status;
 }
-#endif /* USE_OPENSSL */
-#endif /* LIBCURL_FEATURE_SSL */
+#       endif /* USE_OPENSSL */
+#endif     /* LIBCURL_FEATURE_SSL */
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index 29c8520..9657567 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_dbi plugin
-* 
-* License: GPL
-* Copyright (c) 2011 Monitoring Plugins Development Team
-* Author: Sebastian 'tokkee' Harl <sh@teamix.net>
-* 
-* Description:
-* 
-* This file contains the check_dbi plugin
-* 
-* Runs an arbitrary (SQL) command and checks the result.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_dbi plugin
+ *
+ * License: GPL
+ * Copyright (c) 2011-2024 Monitoring Plugins Development Team
+ * Original Author: Sebastian 'tokkee' Harl <sh@teamix.net>
+ *
+ * Description:
+ *
+ * This file contains the check_dbi plugin
+ *
+ * Runs an arbitrary (SQL) command and checks the result.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_dbi";
-const char *copyright = "2011";
+const char *copyright = "2011-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -43,7 +43,7 @@ const char *email = "devel@monitoring-plugins.org";
 
 /* required for NAN */
 #ifndef _ISOC99_SOURCE
-#define _ISOC99_SOURCE
+#       define _ISOC99_SOURCE
 #endif
 
 #include <assert.h>
@@ -70,42 +70,40 @@ typedef struct {
         char *value;
 } driver_option_t;
 
-char *host = NULL;
-int verbose = 0;
+static char *host = NULL;
+static int verbose = 0;
 
-char *warning_range = NULL;
-char *critical_range = NULL;
-thresholds *dbi_thresholds = NULL;
+static char *warning_range = NULL;
+static char *critical_range = NULL;
+static thresholds *dbi_thresholds = NULL;
 
-char *expect = NULL;
+static char *expect = NULL;
 
-regex_t expect_re;
-char *expect_re_str = NULL;
-int expect_re_cflags = 0;
+static regex_t expect_re;
+static char *expect_re_str = NULL;
+static int expect_re_cflags = 0;
 
-np_dbi_metric_t metric = METRIC_QUERY_RESULT;
-np_dbi_type_t type = TYPE_NUMERIC;
+static np_dbi_metric_t metric = METRIC_QUERY_RESULT;
+static np_dbi_type_t type = TYPE_NUMERIC;
 
-char *np_dbi_driver = NULL;
-driver_option_t *np_dbi_options = NULL;
-int np_dbi_options_num = 0;
-char *np_dbi_database = NULL;
-char *np_dbi_query = NULL;
+static char *np_dbi_driver = NULL;
+static driver_option_t *np_dbi_options = NULL;
+static int np_dbi_options_num = 0;
+static char *np_dbi_database = NULL;
+static char *np_dbi_query = NULL;
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_usage (void);
-void print_help (void);
+static int process_arguments(int, char **);
+static int validate_arguments(void);
+void print_usage(void);
+static void print_help(void);
 
-double timediff (struct timeval, struct timeval);
+static double timediff(struct timeval, struct timeval);
 
-void np_dbi_print_error (dbi_conn, char *, ...);
+static void np_dbi_print_error(dbi_conn, char *, ...);
 
-int do_query (dbi_conn, const char **, double *, double *);
+static int do_query(dbi_conn, const char **, double *, double *);
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int status = STATE_UNKNOWN;
 
         dbi_driver driver;
@@ -113,7 +111,8 @@ main (int argc, char **argv)
 
         unsigned int server_version;
 
-        struct timeval start_timeval, end_timeval;
+        struct timeval start_timeval;
+        struct timeval end_timeval;
         double conn_time = 0.0;
         double query_time = 0.0;
 
@@ -122,59 +121,58 @@ main (int argc, char **argv)
 
         int i;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv = np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
         if (verbose > 2)
-                printf ("Initializing DBI\n");
+                printf("Initializing DBI\n");
 
-        dbi_inst *instance_p = { 0 };
+        dbi_inst *instance_p = {0};
 
         if (dbi_initialize_r(NULL, instance_p) < 0) {
-                printf ("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n");
+                printf("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n");
                 return STATE_UNKNOWN;
         }
 
         if (instance_p == NULL) {
-                printf ("UNKNOWN - failed to initialize DBI.\n");
+                printf("UNKNOWN - failed to initialize DBI.\n");
                 return STATE_UNKNOWN;
         }
 
         if (verbose)
-                printf ("Opening DBI driver '%s'\n", np_dbi_driver);
+                printf("Opening DBI driver '%s'\n", np_dbi_driver);
 
         driver = dbi_driver_open_r(np_dbi_driver, instance_p);
-        if (! driver) {
-                printf ("UNKNOWN - failed to open DBI driver '%s'; possibly it's not installed.\n",
-                                np_dbi_driver);
+        if (!driver) {
+                printf("UNKNOWN - failed to open DBI driver '%s'; possibly it's not installed.\n", np_dbi_driver);
 
-                printf ("Known drivers:\n");
+                printf("Known drivers:\n");
                 for (driver = dbi_driver_list_r(NULL, instance_p); driver; driver = dbi_driver_list_r(driver, instance_p)) {
-                        printf (" - %s\n", dbi_driver_get_name (driver));
+                        printf(" - %s\n", dbi_driver_get_name(driver));
                 }
                 return STATE_UNKNOWN;
         }
 
         /* make a connection to the database */
-        gettimeofday (&start_timeval, NULL);
+        gettimeofday(&start_timeval, NULL);
 
-        conn = dbi_conn_open (driver);
-        if (! conn) {
-                printf ("UNKNOWN - failed top open connection object.\n");
-                dbi_conn_close (conn);
+        conn = dbi_conn_open(driver);
+        if (!conn) {
+                printf("UNKNOWN - failed top open connection object.\n");
+                dbi_conn_close(conn);
                 return STATE_UNKNOWN;
         }
 
@@ -182,210 +180,190 @@ main (int argc, char **argv)
                 const char *opt;
 
                 if (verbose > 1)
-                        printf ("Setting DBI driver option '%s' to '%s'\n",
-                                        np_dbi_options[i].key, np_dbi_options[i].value);
+                        printf("Setting DBI driver option '%s' to '%s'\n", np_dbi_options[i].key, np_dbi_options[i].value);
 
-                if (! dbi_conn_set_option (conn, np_dbi_options[i].key, np_dbi_options[i].value))
+                if (!dbi_conn_set_option(conn, np_dbi_options[i].key, np_dbi_options[i].value))
                         continue;
                 /* else: status != 0 */
 
-                np_dbi_print_error (conn, "UNKNOWN - failed to set option '%s' to '%s'",
-                                np_dbi_options[i].key, np_dbi_options[i].value);
-                printf ("Known driver options:\n");
+                np_dbi_print_error(conn, "UNKNOWN - failed to set option '%s' to '%s'", np_dbi_options[i].key, np_dbi_options[i].value);
+                printf("Known driver options:\n");
 
-                for (opt = dbi_conn_get_option_list (conn, NULL); opt;
-                                opt = dbi_conn_get_option_list (conn, opt)) {
-                        printf (" - %s\n", opt);
+                for (opt = dbi_conn_get_option_list(conn, NULL); opt; opt = dbi_conn_get_option_list(conn, opt)) {
+                        printf(" - %s\n", opt);
                 }
-                dbi_conn_close (conn);
+                dbi_conn_close(conn);
                 return STATE_UNKNOWN;
         }
 
         if (host) {
                 if (verbose > 1)
-                        printf ("Setting DBI driver option 'host' to '%s'\n", host);
-                dbi_conn_set_option (conn, "host", host);
+                        printf("Setting DBI driver option 'host' to '%s'\n", host);
+                dbi_conn_set_option(conn, "host", host);
         }
 
         if (verbose) {
-                const char *dbname, *host;
+                const char *dbname;
+                const char *host;
 
-                dbname = dbi_conn_get_option (conn, "dbname");
-                host = dbi_conn_get_option (conn, "host");
+                dbname = dbi_conn_get_option(conn, "dbname");
+                host = dbi_conn_get_option(conn, "host");
 
-                if (! dbname)
+                if (!dbname)
                         dbname = "<unspecified>";
-                if (! host)
+                if (!host)
                         host = "<unspecified>";
 
-                printf ("Connecting to database '%s' at host '%s'\n",
-                                dbname, host);
+                printf("Connecting to database '%s' at host '%s'\n", dbname, host);
         }
 
-        if (dbi_conn_connect (conn) < 0) {
-                np_dbi_print_error (conn, "UNKNOWN - failed to connect to database");
+        if (dbi_conn_connect(conn) < 0) {
+                np_dbi_print_error(conn, "UNKNOWN - failed to connect to database");
                 return STATE_UNKNOWN;
         }
 
-        gettimeofday (&end_timeval, NULL);
-        conn_time = timediff (start_timeval, end_timeval);
+        gettimeofday(&end_timeval, NULL);
+        conn_time = timediff(start_timeval, end_timeval);
 
-        server_version = dbi_conn_get_engine_version (conn);
+        server_version = dbi_conn_get_engine_version(conn);
         if (verbose)
-                printf ("Connected to server version %u\n", server_version);
+                printf("Connected to server version %u\n", server_version);
 
         if (metric == METRIC_SERVER_VERSION)
-                status = get_status (server_version, dbi_thresholds);
+                status = get_status(server_version, dbi_thresholds);
 
         if (verbose)
-                printf ("Time elapsed: %f\n", conn_time);
+                printf("Time elapsed: %f\n", conn_time);
 
         if (metric == METRIC_CONN_TIME)
-                status = get_status (conn_time, dbi_thresholds);
+                status = get_status(conn_time, dbi_thresholds);
 
         /* select a database */
         if (np_dbi_database) {
                 if (verbose > 1)
-                        printf ("Selecting database '%s'\n", np_dbi_database);
+                        printf("Selecting database '%s'\n", np_dbi_database);
 
-                if (dbi_conn_select_db (conn, np_dbi_database)) {
-                        np_dbi_print_error (conn, "UNKNOWN - failed to select database '%s'",
-                                        np_dbi_database);
+                if (dbi_conn_select_db(conn, np_dbi_database)) {
+                        np_dbi_print_error(conn, "UNKNOWN - failed to select database '%s'", np_dbi_database);
                         return STATE_UNKNOWN;
                 }
         }
 
         if (np_dbi_query) {
                 /* execute query */
-                status = do_query (conn, &query_val_str, &query_val, &query_time);
+                status = do_query(conn, &query_val_str, &query_val, &query_time);
                 if (status != STATE_OK)
                         /* do_query prints an error message in this case */
                         return status;
 
                 if (metric == METRIC_QUERY_RESULT) {
                         if (expect) {
-                                if ((! query_val_str) || strcmp (query_val_str, expect))
+                                if ((!query_val_str) || strcmp(query_val_str, expect))
                                         status = STATE_CRITICAL;
                                 else
                                         status = STATE_OK;
-                        }
-                        else if (expect_re_str) {
+                        } else if (expect_re_str) {
                                 int err;
 
-                                err = regexec (&expect_re, query_val_str, 0, NULL, /* flags = */ 0);
-                                if (! err)
+                                err = regexec(&expect_re, query_val_str, 0, NULL, /* flags = */ 0);
+                                if (!err)
                                         status = STATE_OK;
                                 else if (err == REG_NOMATCH)
                                         status = STATE_CRITICAL;
                                 else {
                                         char errmsg[1024];
-                                        regerror (err, &expect_re, errmsg, sizeof (errmsg));
-                                        printf ("ERROR - failed to execute regular expression: %s\n",
-                                                        errmsg);
+                                        regerror(err, &expect_re, errmsg, sizeof(errmsg));
+                                        printf("ERROR - failed to execute regular expression: %s\n", errmsg);
                                         status = STATE_CRITICAL;
                                 }
-                        }
-                        else
-                                status = get_status (query_val, dbi_thresholds);
-                }
-                else if (metric == METRIC_QUERY_TIME)
-                        status = get_status (query_time, dbi_thresholds);
+                        } else
+                                status = get_status(query_val, dbi_thresholds);
+                } else if (metric == METRIC_QUERY_TIME)
+                        status = get_status(query_time, dbi_thresholds);
         }
 
         if (verbose)
                 printf("Closing connection\n");
-        dbi_conn_close (conn);
+        dbi_conn_close(conn);
 
         /* In case of METRIC_QUERY_RESULT, isnan(query_val) indicates an error
          * which should have been reported and handled (abort) before
          * ... unless we expected a string to be returned */
-        assert ((metric != METRIC_QUERY_RESULT) || (! isnan (query_val))
-                        || (type == TYPE_STRING));
+        assert((metric != METRIC_QUERY_RESULT) || (!isnan(query_val)) || (type == TYPE_STRING));
 
-        assert ((type != TYPE_STRING) || (expect || expect_re_str));
+        assert((type != TYPE_STRING) || (expect || expect_re_str));
 
-        printf ("%s - connection time: %fs", state_text (status), conn_time);
+        printf("%s - connection time: %fs", state_text(status), conn_time);
         if (np_dbi_query) {
                 if (type == TYPE_STRING) {
-                        assert (expect || expect_re_str);
-                        printf (", '%s' returned '%s' in %fs", np_dbi_query,
-                                        query_val_str ? query_val_str : "<nothing>", query_time);
+                        assert(expect || expect_re_str);
+                        printf(", '%s' returned '%s' in %fs", np_dbi_query, query_val_str ? query_val_str : "<nothing>", query_time);
                         if (status != STATE_OK) {
                                 if (expect)
-                                        printf (" (expected '%s')", expect);
+                                        printf(" (expected '%s')", expect);
                                 else if (expect_re_str)
-                                        printf (" (expected regex /%s/%s)", expect_re_str,
-                                                        ((expect_re_cflags & REG_ICASE) ? "i" : ""));
+                                        printf(" (expected regex /%s/%s)", expect_re_str, ((expect_re_cflags & REG_ICASE) ? "i" : ""));
                         }
-                }
-                else if (isnan (query_val))
-                        printf (", '%s' query execution time: %fs", np_dbi_query, query_time);
+                } else if (isnan(query_val))
+                        printf(", '%s' query execution time: %fs", np_dbi_query, query_time);
                 else
-                        printf (", '%s' returned %f in %fs", np_dbi_query, query_val, query_time);
+                        printf(", '%s' returned %f in %fs", np_dbi_query, query_val, query_time);
         }
 
-        printf (" | conntime=%fs;%s;%s;0; server_version=%u;%s;%s;0;", conn_time,
-                        ((metric == METRIC_CONN_TIME) && warning_range) ? warning_range : "",
-                        ((metric == METRIC_CONN_TIME) && critical_range) ? critical_range : "",
-                        server_version,
-                        ((metric == METRIC_SERVER_VERSION) && warning_range) ? warning_range : "",
-                        ((metric == METRIC_SERVER_VERSION) && critical_range) ? critical_range : "");
+        printf(" | conntime=%fs;%s;%s;0; server_version=%u;%s;%s;0;", conn_time,
+                   ((metric == METRIC_CONN_TIME) && warning_range) ? warning_range : "",
+                   ((metric == METRIC_CONN_TIME) && critical_range) ? critical_range : "", server_version,
+                   ((metric == METRIC_SERVER_VERSION) && warning_range) ? warning_range : "",
+                   ((metric == METRIC_SERVER_VERSION) && critical_range) ? critical_range : "");
         if (np_dbi_query) {
-                if (! isnan (query_val)) /* this is also true when -e is used */
-                        printf (" query=%f;%s;%s;;", query_val,
-                                        ((metric == METRIC_QUERY_RESULT) && warning_range) ? warning_range : "",
-                                        ((metric == METRIC_QUERY_RESULT) && critical_range) ? critical_range : "");
-                printf (" querytime=%fs;%s;%s;0;", query_time,
-                                ((metric == METRIC_QUERY_TIME) && warning_range) ? warning_range : "",
-                                ((metric == METRIC_QUERY_TIME) && critical_range) ? critical_range : "");
+                if (!isnan(query_val)) /* this is also true when -e is used */
+                        printf(" query=%f;%s;%s;;", query_val, ((metric == METRIC_QUERY_RESULT) && warning_range) ? warning_range : "",
+                                   ((metric == METRIC_QUERY_RESULT) && critical_range) ? critical_range : "");
+                printf(" querytime=%fs;%s;%s;0;", query_time, ((metric == METRIC_QUERY_TIME) && warning_range) ? warning_range : "",
+                           ((metric == METRIC_QUERY_TIME) && critical_range) ? critical_range : "");
         }
-        printf ("\n");
+        printf("\n");
         return status;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
         int c;
 
         int option = 0;
-        static struct option longopts[] = {
-                STD_LONG_OPTS,
-
-                {"expect", required_argument, 0, 'e'},
-                {"regex", required_argument, 0, 'r'},
-                {"regexi", required_argument, 0, 'R'},
-                {"metric", required_argument, 0, 'm'},
-                {"driver", required_argument, 0, 'd'},
-                {"option", required_argument, 0, 'o'},
-                {"query", required_argument, 0, 'q'},
-                {"database", required_argument, 0, 'D'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {STD_LONG_OPTS,
+
+                                                                           {"expect", required_argument, 0, 'e'},
+                                                                           {"regex", required_argument, 0, 'r'},
+                                                                           {"regexi", required_argument, 0, 'R'},
+                                                                           {"metric", required_argument, 0, 'm'},
+                                                                           {"driver", required_argument, 0, 'd'},
+                                                                           {"option", required_argument, 0, 'o'},
+                                                                           {"query", required_argument, 0, 'q'},
+                                                                           {"database", required_argument, 0, 'D'},
+                                                                           {0, 0, 0, 0}};
 
         while (1) {
-                c = getopt_long (argc, argv, "Vvht:c:w:e:r:R:m:H:d:o:q:D:",
-                                longopts, &option);
+                c = getopt_long(argc, argv, "Vvht:c:w:e:r:R:m:H:d:o:q:D:", longopts, &option);
 
                 if (c == EOF)
                         break;
 
                 switch (c) {
-                case '?':     /* usage */
-                        usage5 ();
-                case 'h':     /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-
-                case 'c':     /* critical range */
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+
+                case 'c': /* critical range */
                         critical_range = optarg;
                         type = TYPE_NUMERIC;
                         break;
-                case 'w':     /* warning range */
+                case 'w': /* warning range */
                         warning_range = optarg;
                         type = TYPE_NUMERIC;
                         break;
@@ -396,47 +374,45 @@ process_arguments (int argc, char **argv)
                 case 'R':
                         expect_re_cflags = REG_ICASE;
                         /* fall through */
-                case 'r':
-                        {
-                                int err;
+                case 'r': {
+                        int err;
 
-                                expect_re_cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-                                expect_re_str = optarg;
-                                type = TYPE_STRING;
+                        expect_re_cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+                        expect_re_str = optarg;
+                        type = TYPE_STRING;
 
-                                err = regcomp (&expect_re, expect_re_str, expect_re_cflags);
-                                if (err) {
-                                        char errmsg[1024];
-                                        regerror (err, &expect_re, errmsg, sizeof (errmsg));
-                                        printf ("ERROR - failed to compile regular expression: %s\n",
-                                                        errmsg);
-                                        return ERROR;
-                                }
-                                break;
+                        err = regcomp(&expect_re, expect_re_str, expect_re_cflags);
+                        if (err) {
+                                char errmsg[1024];
+                                regerror(err, &expect_re, errmsg, sizeof(errmsg));
+                                printf("ERROR - failed to compile regular expression: %s\n", errmsg);
+                                return ERROR;
                         }
+                        break;
+                }
 
                 case 'm':
-                        if (! strcasecmp (optarg, "CONN_TIME"))
+                        if (!strcasecmp(optarg, "CONN_TIME"))
                                 metric = METRIC_CONN_TIME;
-                        else if (! strcasecmp (optarg, "SERVER_VERSION"))
+                        else if (!strcasecmp(optarg, "SERVER_VERSION"))
                                 metric = METRIC_SERVER_VERSION;
-                        else if (! strcasecmp (optarg, "QUERY_RESULT"))
+                        else if (!strcasecmp(optarg, "QUERY_RESULT"))
                                 metric = METRIC_QUERY_RESULT;
-                        else if (! strcasecmp (optarg, "QUERY_TIME"))
+                        else if (!strcasecmp(optarg, "QUERY_TIME"))
                                 metric = METRIC_QUERY_TIME;
                         else
-                                usage2 (_("Invalid metric"), optarg);
+                                usage2(_("Invalid metric"), optarg);
                         break;
-                case 't':     /* timeout */
-                        if (!is_intnonneg (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                case 't': /* timeout */
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
                         else
-                                timeout_interval = atoi (optarg);
+                                timeout_interval = atoi(optarg);
 
                         break;
-                case 'H':     /* host */
-                        if (!is_host (optarg))
-                                usage2 (_("Invalid hostname/address"), optarg);
+                case 'H': /* host */
+                        if (!is_host(optarg))
+                                usage2(_("Invalid hostname/address"), optarg);
                         else
                                 host = optarg;
                         break;
@@ -447,36 +423,34 @@ process_arguments (int argc, char **argv)
                 case 'd':
                         np_dbi_driver = optarg;
                         break;
-                case 'o':
-                        {
-                                driver_option_t *new;
+                case 'o': {
+                        driver_option_t *new;
 
-                                char *k, *v;
+                        char *k;
+                        char *v;
 
-                                k = optarg;
-                                v = strchr (k, (int)'=');
+                        k = optarg;
+                        v = strchr(k, (int)'=');
 
-                                if (! v)
-                                        usage2 (_("Option must be '<key>=<value>'"), optarg);
+                        if (!v)
+                                usage2(_("Option must be '<key>=<value>'"), optarg);
 
-                                *v = '\0';
-                                ++v;
+                        *v = '\0';
+                        ++v;
 
-                                new = realloc (np_dbi_options,
-                                                (np_dbi_options_num + 1) * sizeof (*new));
-                                if (! new) {
-                                        printf ("UNKNOWN - failed to reallocate memory\n");
-                                        exit (STATE_UNKNOWN);
-                                }
+                        new = realloc(np_dbi_options, (np_dbi_options_num + 1) * sizeof(*new));
+                        if (!new) {
+                                printf("UNKNOWN - failed to reallocate memory\n");
+                                exit(STATE_UNKNOWN);
+                        }
 
-                                np_dbi_options = new;
-                                new = np_dbi_options + np_dbi_options_num;
-                                ++np_dbi_options_num;
+                        np_dbi_options = new;
+                        new = np_dbi_options + np_dbi_options_num;
+                        ++np_dbi_options_num;
 
-                                new->key = k;
-                                new->value = v;
-                        }
-                        break;
+                        new->key = k;
+                        new->value = v;
+                } break;
                 case 'q':
                         np_dbi_query = optarg;
                         break;
@@ -486,341 +460,314 @@ process_arguments (int argc, char **argv)
                 }
         }
 
-        set_thresholds (&dbi_thresholds, warning_range, critical_range);
+        set_thresholds(&dbi_thresholds, warning_range, critical_range);
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-int
-validate_arguments ()
-{
-        if (! np_dbi_driver)
-                usage ("Must specify a DBI driver");
+int validate_arguments(void) {
+        if (!np_dbi_driver)
+                usage("Must specify a DBI driver");
 
-        if (((metric == METRIC_QUERY_RESULT) || (metric == METRIC_QUERY_TIME))
-                        && (! np_dbi_query))
-                usage ("Must specify a query to execute (metric == QUERY_RESULT)");
+        if (((metric == METRIC_QUERY_RESULT) || (metric == METRIC_QUERY_TIME)) && (!np_dbi_query))
+                usage("Must specify a query to execute (metric == QUERY_RESULT)");
 
-        if ((metric != METRIC_CONN_TIME)
-                        && (metric != METRIC_SERVER_VERSION)
-                        && (metric != METRIC_QUERY_RESULT)
-                        && (metric != METRIC_QUERY_TIME))
-                usage ("Invalid metric specified");
+        if ((metric != METRIC_CONN_TIME) && (metric != METRIC_SERVER_VERSION) && (metric != METRIC_QUERY_RESULT) &&
+                (metric != METRIC_QUERY_TIME))
+                usage("Invalid metric specified");
 
         if (expect && (warning_range || critical_range || expect_re_str))
-                usage ("Do not mix -e and -w/-c/-r/-R");
+                usage("Do not mix -e and -w/-c/-r/-R");
 
         if (expect_re_str && (warning_range || critical_range || expect))
-                usage ("Do not mix -r/-R and -w/-c/-e");
+                usage("Do not mix -r/-R and -w/-c/-e");
 
         if (expect && (metric != METRIC_QUERY_RESULT))
-                usage ("Option -e requires metric QUERY_RESULT");
+                usage("Option -e requires metric QUERY_RESULT");
 
         if (expect_re_str && (metric != METRIC_QUERY_RESULT))
-                usage ("Options -r/-R require metric QUERY_RESULT");
+                usage("Options -r/-R require metric QUERY_RESULT");
 
         return OK;
 }
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
-        printf (_("This program connects to an (SQL) database using DBI and checks the\n"
-                        "specified metric against threshold levels. The default metric is\n"
-                        "the result of the specified query.\n"));
+        printf(_("This program connects to an (SQL) database using DBI and checks the\n"
+                         "specified metric against threshold levels. The default metric is\n"
+                         "the result of the specified query.\n"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
+        printf(UT_HELP_VRSN);
 /* include this conditionally to avoid 'zero-length printf format string'
  * compiler warnings */
 #ifdef NP_EXTRA_OPTS
-        printf (UT_EXTRA_OPTS);
+        printf(UT_EXTRA_OPTS);
 #endif
-        printf ("\n");
-
-        printf (" %s\n", "-d, --driver=STRING");
-        printf ("    %s\n", _("DBI driver to use"));
-        printf (" %s\n", "-o, --option=STRING");
-        printf ("    %s\n", _("DBI driver options"));
-        printf (" %s\n", "-q, --query=STRING");
-        printf ("    %s\n", _("query to execute"));
-        printf ("\n");
-
-        printf (UT_WARN_CRIT_RANGE);
-        printf (" %s\n", "-e, --expect=STRING");
-        printf ("    %s\n", _("String to expect as query result"));
-        printf ("    %s\n", _("Do not mix with -w, -c, -r, or -R!"));
-        printf (" %s\n", "-r, --regex=REGEX");
-        printf ("    %s\n", _("Extended POSIX regular expression to check query result against"));
-        printf ("    %s\n", _("Do not mix with -w, -c, -e, or -R!"));
-        printf (" %s\n", "-R, --regexi=REGEX");
-        printf ("    %s\n", _("Case-insensitive extended POSIX regex to check query result against"));
-        printf ("    %s\n", _("Do not mix with -w, -c, -e, or -r!"));
-        printf (" %s\n", "-m, --metric=METRIC");
-        printf ("    %s\n", _("Metric to check thresholds against. Available metrics:"));
-        printf ("    CONN_TIME    - %s\n", _("time used for setting up the database connection"));
-        printf ("    QUERY_RESULT - %s\n", _("result (first column of first row) of the query"));
-        printf ("    QUERY_TIME   - %s\n", _("time used to execute the query"));
-        printf ("                   %s\n", _("(ignore the query result)"));
-        printf ("\n");
-
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-        printf (UT_VERBOSE);
-
-        printf ("\n");
-        printf (" %s\n", _("A DBI driver (-d option) is required. If the specified metric operates"));
-        printf (" %s\n\n", _("on a query, one has to be specified (-q option)."));
-
-        printf (" %s\n", _("This plugin connects to an (SQL) database using libdbi and, optionally,"));
-        printf (" %s\n", _("executes the specified query. The first column of the first row of the"));
-        printf (" %s\n", _("result will be parsed and, in QUERY_RESULT mode, compared with the"));
-        printf (" %s\n", _("warning and critical ranges. The result from the query has to be numeric"));
-        printf (" %s\n\n", _("(strings representing numbers are fine)."));
-
-        printf (" %s\n", _("The number and type of required DBI driver options depends on the actual"));
-        printf (" %s\n", _("driver. See its documentation at http://libdbi-drivers.sourceforge.net/"));
-        printf (" %s\n\n", _("for details."));
-
-        printf (" %s\n", _("Examples:"));
-        printf ("  check_dbi -d pgsql -o username=postgres -m QUERY_RESULT \\\n");
-        printf ("    -q 'SELECT COUNT(*) FROM pg_stat_activity' -w 5 -c 10\n");
-        printf ("  Warning if more than five connections; critical if more than ten.\n\n");
-
-        printf ("  check_dbi -d mysql -H localhost -o username=user -o password=secret \\\n");
-        printf ("    -q 'SELECT COUNT(*) FROM logged_in_users -w 5:20 -c 0:50\n");
-        printf ("  Warning if less than 5 or more than 20 users are logged in; critical\n");
-        printf ("  if more than 50 users.\n\n");
-
-        printf ("  check_dbi -d firebird -o username=user -o password=secret -o dbname=foo \\\n");
-        printf ("    -m CONN_TIME -w 0.5 -c 2\n");
-        printf ("  Warning if connecting to the database takes more than half of a second;\n");
-        printf ("  critical if it takes more than 2 seconds.\n\n");
-
-        printf ("  check_dbi -d mysql -H localhost -o username=user \\\n");
-        printf ("    -q 'SELECT concat(@@version, \" \", @@version_comment)' \\\n");
-        printf ("    -r '^5\\.[01].*MySQL Enterprise Server'\n");
-        printf ("  Critical if the database server is not a MySQL enterprise server in either\n");
-        printf ("  version 5.0.x or 5.1.x.\n\n");
-
-        printf ("  check_dbi -d pgsql -u username=user -m SERVER_VERSION \\\n");
-        printf ("    -w 090000:090099 -c 090000:090199\n");
-        printf ("  Warn if the PostgreSQL server version is not 9.0.x; critical if the version\n");
-        printf ("  is less than 9.x or higher than 9.1.x.\n");
-
-        printf (UT_SUPPORT);
+        printf("\n");
+
+        printf(" %s\n", "-d, --driver=STRING");
+        printf("    %s\n", _("DBI driver to use"));
+        printf(" %s\n", "-o, --option=STRING");
+        printf("    %s\n", _("DBI driver options"));
+        printf(" %s\n", "-q, --query=STRING");
+        printf("    %s\n", _("query to execute"));
+        printf("\n");
+
+        printf(UT_WARN_CRIT_RANGE);
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s\n", _("String to expect as query result"));
+        printf("    %s\n", _("Do not mix with -w, -c, -r, or -R!"));
+        printf(" %s\n", "-r, --regex=REGEX");
+        printf("    %s\n", _("Extended POSIX regular expression to check query result against"));
+        printf("    %s\n", _("Do not mix with -w, -c, -e, or -R!"));
+        printf(" %s\n", "-R, --regexi=REGEX");
+        printf("    %s\n", _("Case-insensitive extended POSIX regex to check query result against"));
+        printf("    %s\n", _("Do not mix with -w, -c, -e, or -r!"));
+        printf(" %s\n", "-m, --metric=METRIC");
+        printf("    %s\n", _("Metric to check thresholds against. Available metrics:"));
+        printf("    CONN_TIME    - %s\n", _("time used for setting up the database connection"));
+        printf("    QUERY_RESULT - %s\n", _("result (first column of first row) of the query"));
+        printf("    QUERY_TIME   - %s\n", _("time used to execute the query"));
+        printf("                   %s\n", _("(ignore the query result)"));
+        printf("\n");
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_VERBOSE);
+
+        printf("\n");
+        printf(" %s\n", _("A DBI driver (-d option) is required. If the specified metric operates"));
+        printf(" %s\n\n", _("on a query, one has to be specified (-q option)."));
+
+        printf(" %s\n", _("This plugin connects to an (SQL) database using libdbi and, optionally,"));
+        printf(" %s\n", _("executes the specified query. The first column of the first row of the"));
+        printf(" %s\n", _("result will be parsed and, in QUERY_RESULT mode, compared with the"));
+        printf(" %s\n", _("warning and critical ranges. The result from the query has to be numeric"));
+        printf(" %s\n\n", _("(strings representing numbers are fine)."));
+
+        printf(" %s\n", _("The number and type of required DBI driver options depends on the actual"));
+        printf(" %s\n", _("driver. See its documentation at http://libdbi-drivers.sourceforge.net/"));
+        printf(" %s\n\n", _("for details."));
+
+        printf(" %s\n", _("Examples:"));
+        printf("  check_dbi -d pgsql -o username=postgres -m QUERY_RESULT \\\n");
+        printf("    -q 'SELECT COUNT(*) FROM pg_stat_activity' -w 5 -c 10\n");
+        printf("  Warning if more than five connections; critical if more than ten.\n\n");
+
+        printf("  check_dbi -d mysql -H localhost -o username=user -o password=secret \\\n");
+        printf("    -q 'SELECT COUNT(*) FROM logged_in_users -w 5:20 -c 0:50\n");
+        printf("  Warning if less than 5 or more than 20 users are logged in; critical\n");
+        printf("  if more than 50 users.\n\n");
+
+        printf("  check_dbi -d firebird -o username=user -o password=secret -o dbname=foo \\\n");
+        printf("    -m CONN_TIME -w 0.5 -c 2\n");
+        printf("  Warning if connecting to the database takes more than half of a second;\n");
+        printf("  critical if it takes more than 2 seconds.\n\n");
+
+        printf("  check_dbi -d mysql -H localhost -o username=user \\\n");
+        printf("    -q 'SELECT concat(@@version, \" \", @@version_comment)' \\\n");
+        printf("    -r '^5\\.[01].*MySQL Enterprise Server'\n");
+        printf("  Critical if the database server is not a MySQL enterprise server in either\n");
+        printf("  version 5.0.x or 5.1.x.\n\n");
+
+        printf("  check_dbi -d pgsql -u username=user -m SERVER_VERSION \\\n");
+        printf("    -w 090000:090099 -c 090000:090199\n");
+        printf("  Warn if the PostgreSQL server version is not 9.0.x; critical if the version\n");
+        printf("  is less than 9.x or higher than 9.1.x.\n");
+
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -d <DBI driver> [-o <DBI driver option> [...]] [-q <query>]\n", progname);
-        printf (" [-H <host>] [-c <critical range>] [-w <warning range>] [-m <metric>]\n");
-        printf (" [-e <string>] [-r|-R <regex>]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -d <DBI driver> [-o <DBI driver option> [...]] [-q <query>]\n", progname);
+        printf(" [-H <host>] [-c <critical range>] [-w <warning range>] [-m <metric>]\n");
+        printf(" [-e <string>] [-r|-R <regex>]\n");
 }
 
-#define CHECK_IGNORE_ERROR(s) \
-        do { \
-                if (metric != METRIC_QUERY_RESULT) \
-                        return (s); \
+#define CHECK_IGNORE_ERROR(s)                                                                                                              \
+        do {                                                                                                                                   \
+                if (metric != METRIC_QUERY_RESULT)                                                                                                 \
+                        return (s);                                                                                                                    \
         } while (0)
 
-const char *
-get_field_str (dbi_conn conn, dbi_result res, unsigned short field_type)
-{
+const char *get_field_str(dbi_conn conn, dbi_result res, unsigned short field_type) {
         const char *str;
 
         if (field_type != DBI_TYPE_STRING) {
-                printf ("CRITICAL - result value is not a string\n");
+                printf("CRITICAL - result value is not a string\n");
                 return NULL;
         }
 
-        str = dbi_result_get_string_idx (res, 1);
-        if ((! str) || (strcmp (str, "ERROR") == 0)) {
-                CHECK_IGNORE_ERROR (NULL);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch string value");
+        str = dbi_result_get_string_idx(res, 1);
+        if ((!str) || (strcmp(str, "ERROR") == 0)) {
+                CHECK_IGNORE_ERROR(NULL);
+                np_dbi_print_error(conn, "CRITICAL - failed to fetch string value");
                 return NULL;
         }
 
         if ((verbose && (type == TYPE_STRING)) || (verbose > 2))
-                printf ("Query returned string '%s'\n", str);
+                printf("Query returned string '%s'\n", str);
         return str;
 }
 
-double
-get_field (dbi_conn conn, dbi_result res, unsigned short *field_type)
-{
+double get_field(dbi_conn conn, dbi_result res, unsigned short *field_type) {
         double val = NAN;
 
         if (*field_type == DBI_TYPE_INTEGER) {
-                val = (double)dbi_result_get_longlong_idx (res, 1);
-        }
-        else if (*field_type == DBI_TYPE_DECIMAL) {
-                val = dbi_result_get_double_idx (res, 1);
-        }
-        else if (*field_type == DBI_TYPE_STRING) {
+                val = (double)dbi_result_get_longlong_idx(res, 1);
+        } else if (*field_type == DBI_TYPE_DECIMAL) {
+                val = dbi_result_get_double_idx(res, 1);
+        } else if (*field_type == DBI_TYPE_STRING) {
                 const char *val_str;
                 char *endptr = NULL;
 
-                val_str = get_field_str (conn, res, *field_type);
-                if (! val_str) {
-                        CHECK_IGNORE_ERROR (NAN);
+                val_str = get_field_str(conn, res, *field_type);
+                if (!val_str) {
+                        CHECK_IGNORE_ERROR(NAN);
                         *field_type = DBI_TYPE_ERROR;
                         return NAN;
                 }
 
-                val = strtod (val_str, &endptr);
+                val = strtod(val_str, &endptr);
                 if (endptr == val_str) {
-                        CHECK_IGNORE_ERROR (NAN);
-                        printf ("CRITICAL - result value is not a numeric: %s\n", val_str);
+                        CHECK_IGNORE_ERROR(NAN);
+                        printf("CRITICAL - result value is not a numeric: %s\n", val_str);
                         *field_type = DBI_TYPE_ERROR;
                         return NAN;
                 }
-                else if ((endptr != NULL) && (*endptr != '\0')) {
+                if ((endptr != NULL) && (*endptr != '\0')) {
                         if (verbose)
-                                printf ("Garbage after value: %s\n", endptr);
+                                printf("Garbage after value: %s\n", endptr);
                 }
-        }
-        else {
-                CHECK_IGNORE_ERROR (NAN);
-                printf ("CRITICAL - cannot parse value of type %s (%i)\n",
-                                (*field_type == DBI_TYPE_BINARY)
-                                        ? "BINARY"
-                                        : (*field_type == DBI_TYPE_DATETIME)
-                                                ? "DATETIME"
-                                                : "<unknown>",
-                                *field_type);
+        } else {
+                CHECK_IGNORE_ERROR(NAN);
+                printf("CRITICAL - cannot parse value of type %s (%i)\n",
+                           (*field_type == DBI_TYPE_BINARY)     ? "BINARY"
+                           : (*field_type == DBI_TYPE_DATETIME) ? "DATETIME"
+                                                                                                        : "<unknown>",
+                           *field_type);
                 *field_type = DBI_TYPE_ERROR;
                 return NAN;
         }
         return val;
 }
 
-double
-get_query_result (dbi_conn conn, dbi_result res, const char **res_val_str, double *res_val)
-{
+double get_query_result(dbi_conn conn, dbi_result res, const char **res_val_str, double *res_val) {
         unsigned short field_type;
         double val = NAN;
 
-        if (dbi_result_get_numrows (res) == DBI_ROW_ERROR) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch rows");
+        if (dbi_result_get_numrows(res) == DBI_ROW_ERROR) {
+                CHECK_IGNORE_ERROR(STATE_OK);
+                np_dbi_print_error(conn, "CRITICAL - failed to fetch rows");
                 return STATE_CRITICAL;
         }
 
-        if (dbi_result_get_numrows (res) < 1) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                printf ("WARNING - no rows returned\n");
+        if (dbi_result_get_numrows(res) < 1) {
+                CHECK_IGNORE_ERROR(STATE_OK);
+                printf("WARNING - no rows returned\n");
                 return STATE_WARNING;
         }
 
-        if (dbi_result_get_numfields (res) == DBI_FIELD_ERROR) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch fields");
+        if (dbi_result_get_numfields(res) == DBI_FIELD_ERROR) {
+                CHECK_IGNORE_ERROR(STATE_OK);
+                np_dbi_print_error(conn, "CRITICAL - failed to fetch fields");
                 return STATE_CRITICAL;
         }
 
-        if (dbi_result_get_numfields (res) < 1) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                printf ("WARNING - no fields returned\n");
+        if (dbi_result_get_numfields(res) < 1) {
+                CHECK_IGNORE_ERROR(STATE_OK);
+                printf("WARNING - no fields returned\n");
                 return STATE_WARNING;
         }
 
-        if (dbi_result_first_row (res) != 1) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch first row");
+        if (dbi_result_first_row(res) != 1) {
+                CHECK_IGNORE_ERROR(STATE_OK);
+                np_dbi_print_error(conn, "CRITICAL - failed to fetch first row");
                 return STATE_CRITICAL;
         }
 
-        field_type = dbi_result_get_field_type_idx (res, 1);
+        field_type = dbi_result_get_field_type_idx(res, 1);
         if (field_type != DBI_TYPE_ERROR) {
                 if (type == TYPE_STRING)
                         /* the value will be freed in dbi_result_free */
-                        *res_val_str = strdup (get_field_str (conn, res, field_type));
+                        *res_val_str = strdup(get_field_str(conn, res, field_type));
                 else
-                        val = get_field (conn, res, &field_type);
+                        val = get_field(conn, res, &field_type);
         }
 
         *res_val = val;
 
         if (field_type == DBI_TYPE_ERROR) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch data");
+                CHECK_IGNORE_ERROR(STATE_OK);
+                np_dbi_print_error(conn, "CRITICAL - failed to fetch data");
                 return STATE_CRITICAL;
         }
 
-        dbi_result_free (res);
+        dbi_result_free(res);
         return STATE_OK;
 }
 
 #undef CHECK_IGNORE_ERROR
 
-int
-do_query (dbi_conn conn, const char **res_val_str, double *res_val, double *res_time)
-{
+int do_query(dbi_conn conn, const char **res_val_str, double *res_val, double *res_time) {
         dbi_result res;
 
-        struct timeval timeval_start, timeval_end;
+        struct timeval timeval_start;
+        struct timeval timeval_end;
         int status = STATE_OK;
 
-        assert (np_dbi_query);
+        assert(np_dbi_query);
 
         if (verbose)
-                printf ("Executing query '%s'\n", np_dbi_query);
+                printf("Executing query '%s'\n", np_dbi_query);
 
-        gettimeofday (&timeval_start, NULL);
+        gettimeofday(&timeval_start, NULL);
 
-        res = dbi_conn_query (conn, np_dbi_query);
-        if (! res) {
-                np_dbi_print_error (conn, "CRITICAL - failed to execute query '%s'", np_dbi_query);
+        res = dbi_conn_query(conn, np_dbi_query);
+        if (!res) {
+                np_dbi_print_error(conn, "CRITICAL - failed to execute query '%s'", np_dbi_query);
                 return STATE_CRITICAL;
         }
 
-        status = get_query_result (conn, res, res_val_str, res_val);
+        status = get_query_result(conn, res, res_val_str, res_val);
 
-        gettimeofday (&timeval_end, NULL);
-        *res_time = timediff (timeval_start, timeval_end);
+        gettimeofday(&timeval_end, NULL);
+        *res_time = timediff(timeval_start, timeval_end);
 
         if (verbose)
-                printf ("Time elapsed: %f\n", *res_time);
+                printf("Time elapsed: %f\n", *res_time);
 
         return status;
 }
 
-double
-timediff (struct timeval start, struct timeval end)
-{
+double timediff(struct timeval start, struct timeval end) {
         double diff;
 
         while (start.tv_usec > end.tv_usec) {
                 --end.tv_sec;
                 end.tv_usec += 1000000;
         }
-        diff = (double)(end.tv_sec - start.tv_sec)
-                + (double)(end.tv_usec - start.tv_usec) / 1000000.0;
+        diff = (double)(end.tv_sec - start.tv_sec) + (double)(end.tv_usec - start.tv_usec) / 1000000.0;
         return diff;
 }
 
-void
-np_dbi_print_error (dbi_conn conn, char *fmt, ...)
-{
+void np_dbi_print_error(dbi_conn conn, char *fmt, ...) {
         const char *errmsg = NULL;
         va_list ap;
 
-        va_start (ap, fmt);
+        va_start(ap, fmt);
 
-        dbi_conn_error (conn, &errmsg);
-        vprintf (fmt, ap);
-        printf (": %s\n", errmsg);
+        dbi_conn_error(conn, &errmsg);
+        vprintf(fmt, ap);
+        printf(": %s\n", errmsg);
 
-        va_end (ap);
+        va_end(ap);
 }
-
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index be7a610..2bbd1e0 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -1,30 +1,30 @@
 /*****************************************************************************
-* 
-* Monitoring check_dig plugin
-* 
-* License: GPL
-* Copyright (c) 2002-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dig plugin
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_dig plugin
+ *
+ * License: GPL
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dig plugin
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 /* Hackers note:
  *  There are typecasts to (char *) from _("foo bar") in this file.
@@ -33,7 +33,7 @@
  *  because on some architectures those strings are in non-writable memory */
 
 const char *progname = "check_dig";
-const char *copyright = "2002-2008";
+const char *copyright = "2002-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -41,340 +41,312 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 #include "runcmd.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static void print_help(void);
+void print_usage(void);
 
-#define UNDEFINED 0
-#define DEFAULT_PORT 53
+#define UNDEFINED     0
+#define DEFAULT_PORT  53
 #define DEFAULT_TRIES 2
 
-char *query_address = NULL;
-char *record_type = "A";
-char *expected_address = NULL;
-char *dns_server = NULL;
-char *dig_args = "";
-char *query_transport = "";
-bool verbose = false;
-int server_port = DEFAULT_PORT;
-int number_tries = DEFAULT_TRIES;
-double warning_interval = UNDEFINED;
-double critical_interval = UNDEFINED;
-struct timeval tv;
-
-int
-main (int argc, char **argv)
-{
-  char *command_line;
-  output chld_out, chld_err;
-  char *msg = NULL;
-  size_t i;
-  char *t;
-  long microsec;
-  double elapsed_time;
-  int result = STATE_UNKNOWN;
-  int timeout_interval_dig;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Set signal handling and alarm */
-  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
-    usage_va(_("Cannot catch SIGALRM"));
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR)
-    usage_va(_("Could not parse arguments"));
-
-  /* dig applies the timeout to each try, so we need to work around this */
-  timeout_interval_dig = timeout_interval / number_tries + number_tries;
-
-  /* get the command to run */
-  xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d",
-            PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig);
-
-  alarm (timeout_interval);
-  gettimeofday (&tv, NULL);
-
-  if (verbose) {
-    printf ("%s\n", command_line);
-    if(expected_address != NULL) {
-      printf (_("Looking for: '%s'\n"), expected_address);
-    } else {
-      printf (_("Looking for: '%s'\n"), query_address);
-    }
-  }
-
-  /* run the command */
-  if(np_runcmd(command_line, &chld_out, &chld_err, 0) != 0) {
-    result = STATE_WARNING;
-    msg = (char *)_("dig returned an error status");
-  }
-
-  for(i = 0; i < chld_out.lines; i++) {
-    /* the server is responding, we just got the host name... */
-    if (strstr (chld_out.line[i], ";; ANSWER SECTION:")) {
-
-      /* loop through the whole 'ANSWER SECTION' */
-      for(; i < chld_out.lines; i++) {
-        /* get the host address */
-        if (verbose)
-          printf ("%s\n", chld_out.line[i]);
-
-        if (strcasestr (chld_out.line[i], (expected_address == NULL ? query_address : expected_address)) != NULL) {
-          msg = chld_out.line[i];
-          result = STATE_OK;
-
-          /* Translate output TAB -> SPACE */
-          t = msg;
-          while ((t = strchr(t, '\t')) != NULL) *t = ' ';
-          break;
-        }
-      }
-
-      if (result == STATE_UNKNOWN) {
-        msg = (char *)_("Server not found in ANSWER SECTION");
-        result = STATE_WARNING;
-      }
-
-      /* we found the answer section, so break out of the loop */
-      break;
-    }
-  }
-
-  if (result == STATE_UNKNOWN) {
-    msg = (char *)_("No ANSWER SECTION found");
-    result = STATE_CRITICAL;
-  }
-
-  /* If we get anything on STDERR, at least set warning */
-  if(chld_err.buflen > 0) {
-    result = max_state(result, STATE_WARNING);
-    if(!msg) for(i = 0; i < chld_err.lines; i++) {
-      msg = strchr(chld_err.line[0], ':');
-      if(msg) {
-        msg++;
-        break;
-      }
-    }
-  }
-
-  microsec = deltime (tv);
-  elapsed_time = (double)microsec / 1.0e6;
-
-  if (critical_interval > UNDEFINED && elapsed_time > critical_interval)
-    result = STATE_CRITICAL;
-
-  else if (warning_interval > UNDEFINED && elapsed_time > warning_interval)
-    result = STATE_WARNING;
-
-  printf ("DNS %s - %.3f seconds response time (%s)|%s\n",
-          state_text (result), elapsed_time,
-          msg ? msg : _("Probably a non-existent host/domain"),
-          fperfdata("time", elapsed_time, "s",
-                    (warning_interval>UNDEFINED ? true:false),
-                    warning_interval,
-                    (critical_interval>UNDEFINED ? true:false),
-            critical_interval,
-            true, 0, false, 0));
-  return result;
+static char *query_address = NULL;
+static char *record_type = "A";
+static char *expected_address = NULL;
+static char *dns_server = NULL;
+static char *dig_args = "";
+static char *query_transport = "";
+static bool verbose = false;
+static int server_port = DEFAULT_PORT;
+static int number_tries = DEFAULT_TRIES;
+static double warning_interval = UNDEFINED;
+static double critical_interval = UNDEFINED;
+static struct timeval tv;
+
+int main(int argc, char **argv) {
+        char *command_line;
+        output chld_out;
+        output chld_err;
+        char *msg = NULL;
+        size_t i;
+        char *t;
+        long microsec;
+        double elapsed_time;
+        int result = STATE_UNKNOWN;
+        int timeout_interval_dig;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Set signal handling and alarm */
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
+                usage_va(_("Cannot catch SIGALRM"));
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        if (process_arguments(argc, argv) == ERROR)
+                usage_va(_("Could not parse arguments"));
+
+        /* dig applies the timeout to each try, so we need to work around this */
+        timeout_interval_dig = timeout_interval / number_tries + number_tries;
+
+        /* get the command to run */
+        xasprintf(&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", PATH_TO_DIG, dig_args, query_transport, server_port, dns_server,
+                          query_address, record_type, number_tries, timeout_interval_dig);
+
+        alarm(timeout_interval);
+        gettimeofday(&tv, NULL);
+
+        if (verbose) {
+                printf("%s\n", command_line);
+                if (expected_address != NULL) {
+                        printf(_("Looking for: '%s'\n"), expected_address);
+                } else {
+                        printf(_("Looking for: '%s'\n"), query_address);
+                }
+        }
+
+        /* run the command */
+        if (np_runcmd(command_line, &chld_out, &chld_err, 0) != 0) {
+                result = STATE_WARNING;
+                msg = (char *)_("dig returned an error status");
+        }
+
+        for (i = 0; i < chld_out.lines; i++) {
+                /* the server is responding, we just got the host name... */
+                if (strstr(chld_out.line[i], ";; ANSWER SECTION:")) {
+
+                        /* loop through the whole 'ANSWER SECTION' */
+                        for (; i < chld_out.lines; i++) {
+                                /* get the host address */
+                                if (verbose)
+                                        printf("%s\n", chld_out.line[i]);
+
+                                if (strcasestr(chld_out.line[i], (expected_address == NULL ? query_address : expected_address)) != NULL) {
+                                        msg = chld_out.line[i];
+                                        result = STATE_OK;
+
+                                        /* Translate output TAB -> SPACE */
+                                        t = msg;
+                                        while ((t = strchr(t, '\t')) != NULL)
+                                                *t = ' ';
+                                        break;
+                                }
+                        }
+
+                        if (result == STATE_UNKNOWN) {
+                                msg = (char *)_("Server not found in ANSWER SECTION");
+                                result = STATE_WARNING;
+                        }
+
+                        /* we found the answer section, so break out of the loop */
+                        break;
+                }
+        }
+
+        if (result == STATE_UNKNOWN) {
+                msg = (char *)_("No ANSWER SECTION found");
+                result = STATE_CRITICAL;
+        }
+
+        /* If we get anything on STDERR, at least set warning */
+        if (chld_err.buflen > 0) {
+                result = max_state(result, STATE_WARNING);
+                if (!msg)
+                        for (i = 0; i < chld_err.lines; i++) {
+                                msg = strchr(chld_err.line[0], ':');
+                                if (msg) {
+                                        msg++;
+                                        break;
+                                }
+                        }
+        }
+
+        microsec = deltime(tv);
+        elapsed_time = (double)microsec / 1.0e6;
+
+        if (critical_interval > UNDEFINED && elapsed_time > critical_interval)
+                result = STATE_CRITICAL;
+
+        else if (warning_interval > UNDEFINED && elapsed_time > warning_interval)
+                result = STATE_WARNING;
+
+        printf("DNS %s - %.3f seconds response time (%s)|%s\n", state_text(result), elapsed_time,
+                   msg ? msg : _("Probably a non-existent host/domain"),
+                   fperfdata("time", elapsed_time, "s", (warning_interval > UNDEFINED ? true : false), warning_interval,
+                                         (critical_interval > UNDEFINED ? true : false), critical_interval, true, 0, false, 0));
+        return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-
-  int option = 0;
-  static struct option longopts[] = {
-    {"hostname", required_argument, 0, 'H'},
-    {"query_address", required_argument, 0, 'l'},
-    {"warning", required_argument, 0, 'w'},
-    {"critical", required_argument, 0, 'c'},
-    {"timeout", required_argument, 0, 't'},
-    {"dig-arguments", required_argument, 0, 'A'},
-    {"verbose", no_argument, 0, 'v'},
-    {"version", no_argument, 0, 'V'},
-    {"help", no_argument, 0, 'h'},
-    {"record_type", required_argument, 0, 'T'},
-    {"expected_address", required_argument, 0, 'a'},
-    {"port", required_argument, 0, 'p'},
-    {"use-ipv4", no_argument, 0, '4'},
-    {"use-ipv6", no_argument, 0, '6'},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  while (1) {
-    c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 'h':                 /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V':                 /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'H':                 /* hostname */
-      host_or_die(optarg);
-      dns_server = optarg;
-      break;
-    case 'p':                 /* server port */
-      if (is_intpos (optarg)) {
-        server_port = atoi (optarg);
-      }
-      else {
-        usage_va(_("Port must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 'l':                 /* address to lookup */
-      query_address = optarg;
-      break;
-    case 'w':                 /* warning */
-      if (is_nonnegative (optarg)) {
-        warning_interval = strtod (optarg, NULL);
-      }
-      else {
-        usage_va(_("Warning interval must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 'c':                 /* critical */
-      if (is_nonnegative (optarg)) {
-        critical_interval = strtod (optarg, NULL);
-      }
-      else {
-        usage_va(_("Critical interval must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 't':                 /* timeout */
-      if (is_intnonneg (optarg)) {
-        timeout_interval = atoi (optarg);
-      }
-      else {
-        usage_va(_("Timeout interval must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 'A':                 /* dig arguments */
-      dig_args = strdup(optarg);
-      break;
-    case 'v':                 /* verbose */
-      verbose = true;
-      break;
-    case 'T':
-      record_type = optarg;
-      break;
-    case 'a':
-      expected_address = optarg;
-      break;
-    case '4':
-      query_transport = "-4";
-      break;
-    case '6':
-      query_transport = "-6";
-      break;
-    default:                  /* usage5 */
-      usage5();
-    }
-  }
-
-  c = optind;
-  if (dns_server == NULL) {
-    if (c < argc) {
-      host_or_die(argv[c]);
-      dns_server = argv[c];
-    }
-    else {
-      if (strcmp(query_transport,"-6") == 0)
-        dns_server = strdup("::1");
-      else
-        dns_server = strdup ("127.0.0.1");
-    }
-  }
-
-  return validate_arguments ();
+int process_arguments(int argc, char **argv) {
+        int c;
+
+        int option = 0;
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"query_address", required_argument, 0, 'l'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"dig-arguments", required_argument, 0, 'A'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"record_type", required_argument, 0, 'T'},
+                                                                           {"expected_address", required_argument, 0, 'a'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2)
+                return ERROR;
+
+        while (1) {
+                c = getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'H': /* hostname */
+                        host_or_die(optarg);
+                        dns_server = optarg;
+                        break;
+                case 'p': /* server port */
+                        if (is_intpos(optarg)) {
+                                server_port = atoi(optarg);
+                        } else {
+                                usage_va(_("Port must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 'l': /* address to lookup */
+                        query_address = optarg;
+                        break;
+                case 'w': /* warning */
+                        if (is_nonnegative(optarg)) {
+                                warning_interval = strtod(optarg, NULL);
+                        } else {
+                                usage_va(_("Warning interval must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 'c': /* critical */
+                        if (is_nonnegative(optarg)) {
+                                critical_interval = strtod(optarg, NULL);
+                        } else {
+                                usage_va(_("Critical interval must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                timeout_interval = atoi(optarg);
+                        } else {
+                                usage_va(_("Timeout interval must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 'A': /* dig arguments */
+                        dig_args = strdup(optarg);
+                        break;
+                case 'v': /* verbose */
+                        verbose = true;
+                        break;
+                case 'T':
+                        record_type = optarg;
+                        break;
+                case 'a':
+                        expected_address = optarg;
+                        break;
+                case '4':
+                        query_transport = "-4";
+                        break;
+                case '6':
+                        query_transport = "-6";
+                        break;
+                default: /* usage5 */
+                        usage5();
+                }
+        }
+
+        c = optind;
+        if (dns_server == NULL) {
+                if (c < argc) {
+                        host_or_die(argv[c]);
+                        dns_server = argv[c];
+                } else {
+                        if (strcmp(query_transport, "-6") == 0)
+                                dns_server = strdup("::1");
+                        else
+                                dns_server = strdup("127.0.0.1");
+                }
+        }
+
+        return validate_arguments();
 }
 
-
-
-int
-validate_arguments (void)
-{
-  if (query_address != NULL)
-    return OK;
-  else
-    return ERROR;
+int validate_arguments(void) {
+        if (query_address != NULL)
+                return OK;
+        return ERROR;
 }
 
+void print_help(void) {
+        char *myport;
 
+        xasprintf(&myport, "%d", DEFAULT_PORT);
 
-void
-print_help (void)
-{
-  char *myport;
+        print_revision(progname, NP_VERSION);
 
-  xasprintf (&myport, "%d", DEFAULT_PORT);
+        printf("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
+        printf(COPYRIGHT, copyright, email);
 
-  print_revision (progname, NP_VERSION);
+        printf(_("This plugin tests the DNS service on the specified host using dig"));
 
-  printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("\n\n");
 
-  printf (_("This plugin tests the DNS service on the specified host using dig"));
+        print_usage();
 
-  printf ("\n\n");
+        printf(UT_HELP_VRSN);
 
-  print_usage ();
+        printf(UT_EXTRA_OPTS);
 
-  printf (UT_HELP_VRSN);
+        printf(UT_HOST_PORT, 'p', myport);
 
-  printf (UT_EXTRA_OPTS);
+        printf(" %s\n", "-4, --use-ipv4");
+        printf("    %s\n", _("Force dig to only use IPv4 query transport"));
+        printf(" %s\n", "-6, --use-ipv6");
+        printf("    %s\n", _("Force dig to only use IPv6 query transport"));
+        printf(" %s\n", "-l, --query_address=STRING");
+        printf("    %s\n", _("Machine name to lookup"));
+        printf(" %s\n", "-T, --record_type=STRING");
+        printf("    %s\n", _("Record type to lookup (default: A)"));
+        printf(" %s\n", "-a, --expected_address=STRING");
+        printf("    %s\n", _("An address expected to be in the answer section. If not set, uses whatever"));
+        printf("    %s\n", _("was in -l"));
+        printf(" %s\n", "-A, --dig-arguments=STRING");
+        printf("    %s\n", _("Pass STRING as argument(s) to dig"));
+        printf(UT_WARN_CRIT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_VERBOSE);
 
-  printf (UT_HOST_PORT, 'p', myport);
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\"");
+        printf(" %s\n", "This will send a tcp query to DNSSERVER for www.example.com");
 
-  printf (" %s\n","-4, --use-ipv4");
-  printf ("    %s\n",_("Force dig to only use IPv4 query transport"));
-  printf (" %s\n","-6, --use-ipv6");
-  printf ("    %s\n",_("Force dig to only use IPv6 query transport"));
-  printf (" %s\n","-l, --query_address=STRING");
-  printf ("    %s\n",_("Machine name to lookup"));
-  printf (" %s\n","-T, --record_type=STRING");
-  printf ("    %s\n",_("Record type to lookup (default: A)"));
-  printf (" %s\n","-a, --expected_address=STRING");
-  printf ("    %s\n",_("An address expected to be in the answer section. If not set, uses whatever"));
-  printf ("    %s\n",_("was in -l"));
-  printf (" %s\n","-A, --dig-arguments=STRING");
-  printf ("    %s\n",_("Pass STRING as argument(s) to dig"));
-  printf (UT_WARN_CRIT);
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\"");
-  printf (" %s\n", "This will send a tcp query to DNSSERVER for www.example.com");
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf ("%s -l <query_address> [-H <host>] [-p <server port>]\n", progname);
-  printf (" [-T <query type>] [-w <warning interval>] [-c <critical interval>]\n");
-  printf (" [-t <timeout>] [-a <expected answer address>] [-v]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -l <query_address> [-H <host>] [-p <server port>]\n", progname);
+        printf(" [-T <query type>] [-w <warning interval>] [-c <critical interval>]\n");
+        printf(" [-t <timeout>] [-a <expected answer address>] [-v]\n");
 }
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index b3dd301..d1d1b92 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1,43 +1,42 @@
 /*****************************************************************************
-*
-* Monitoring check_disk plugin
-*
-* License: GPL
-* Copyright (c) 1999-2008 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_disk plugin
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_disk plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_disk plugin
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_disk";
-const char *program_name = "check_disk";  /* Required for coreutils libs */
-const char *copyright = "1999-2008";
+const char *program_name = "check_disk"; /* Required for coreutils libs */
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
-
 #include "common.h"
 #ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#       include <sys/stat.h>
 #endif
 #if HAVE_INTTYPES_H
-# include <inttypes.h>
+#       include <inttypes.h>
 #endif
 #include <assert.h>
 #include "popen.h"
@@ -48,14 +47,14 @@ const char *email = "devel@monitoring-plugins.org";
 #include "mountlist.h"
 #include <float.h>
 #if HAVE_LIMITS_H
-# include <limits.h>
+#       include <limits.h>
 #endif
 #include "regex.h"
 
 #ifdef __CYGWIN__
-# include <windows.h>
-# undef ERROR
-# define ERROR -1
+#       include <windows.h>
+#       undef ERROR
+#       define ERROR -1
 #endif
 
 /* If nonzero, show even filesystems with zero size or
@@ -108,25 +107,24 @@ static struct mount_entry *mount_list;
 
 /* For long options that have no equivalent short option, use a
    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
-enum
-{
-  SYNC_OPTION = CHAR_MAX + 1,
-  NO_SYNC_OPTION,
-  BLOCK_SIZE_OPTION
+enum {
+        SYNC_OPTION = CHAR_MAX + 1,
+        NO_SYNC_OPTION,
+        BLOCK_SIZE_OPTION
 };
 
 #ifdef _AIX
-#pragma alloca
+#       pragma alloca
 #endif
 
-static int process_arguments (int, char **);
-static void set_all_thresholds (struct parameter_list *path);
-static void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void set_all_thresholds(struct parameter_list *path);
+static void print_help(void);
+void print_usage(void);
 static double calculate_percent(uintmax_t, uintmax_t);
-static bool stat_path (struct parameter_list *p);
-static void get_stats (struct parameter_list *p, struct fs_usage *fsp);
-static void get_path_stats (struct parameter_list *p, struct fs_usage *fsp);
+static bool stat_path(struct parameter_list *p);
+static void get_stats(struct parameter_list *p, struct fs_usage *fsp);
+static void get_path_stats(struct parameter_list *p, struct fs_usage *fsp);
 
 static char *units;
 static uintmax_t mult = 1024 * 1024;
@@ -155,992 +153,961 @@ static char *group = NULL;
 static struct stat *stat_buf;
 static struct name_list *seen = NULL;
 
-
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
-  int disk_result = STATE_UNKNOWN;
-  char *output;
-  char *ignored;
-  char *details;
-  char *perf;
-  char *perf_ilabel;
-  char *preamble = " - free space:";
-  char *ignored_preamble = " - ignored paths:";
-  char *flag_header;
-  int temp_result;
-
-  struct mount_entry *me;
-  struct fs_usage fsp;
-  struct parameter_list *temp_list, *path;
+int main(int argc, char **argv) {
+        int result = STATE_UNKNOWN;
+        int disk_result = STATE_UNKNOWN;
+        char *output;
+        char *ignored;
+        char *details;
+        char *perf;
+        char *perf_ilabel;
+        char *preamble = " - free space:";
+        char *ignored_preamble = " - ignored paths:";
+        char *flag_header;
+        int temp_result;
+
+        struct mount_entry *me;
+        struct fs_usage fsp;
+        struct parameter_list *temp_list;
+        struct parameter_list *path;
 
 #ifdef __CYGWIN__
-  char mountdir[32];
+        char mountdir[32];
 #endif
 
-  output = strdup ("");
-  ignored = strdup ("");
-  details = strdup ("");
-  perf = strdup ("");
-  perf_ilabel = strdup ("");
-  stat_buf = malloc(sizeof *stat_buf);
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  mount_list = read_file_system_list (0);
-
-  /* Parse extra opts if any */
-  argv = np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR)
-    usage4 (_("Could not parse arguments"));
-
-  /* If a list of paths has not been selected, find entire
-     mount list and create list of paths
-   */
-  if (path_selected == false && path_ignored == false) {
-    for (me = mount_list; me; me = me->me_next) {
-      if (! (path = np_find_parameter(path_select_list, me->me_mountdir))) {
-        path = np_add_parameter(&path_select_list, me->me_mountdir);
-      }
-      path->best_match = me;
-      path->group = group;
-      set_all_thresholds(path);
-    }
-  }
-
-  if (path_ignored == false) {
-    np_set_best_match(path_select_list, mount_list, exact_match);
-  }
-
-  /* Error if no match found for specified paths */
-  temp_list = path_select_list;
-
-  while (path_select_list) {
-    if (! path_select_list->best_match && ignore_missing == true) {
-      /* If the first element will be deleted, the temp_list must be updated with the new start address as well */
-      if (path_select_list == temp_list) {
-        temp_list = path_select_list->name_next;
-      }
-      /* Add path argument to list of ignored paths to inform about missing paths being ignored and not alerted */
-      xasprintf (&ignored, "%s %s;", ignored, path_select_list->name);
-      /* Delete the path from the list so that it is not stat-checked later in the code. */
-      path_select_list = np_del_parameter(path_select_list, path_select_list->name_prev);
-    } else if (! path_select_list->best_match) {
-      /* Without --ignore-missing option, exit with Critical state. */
-      die (STATE_CRITICAL, _("DISK %s: %s not found\n"), _("CRITICAL"), path_select_list->name);
-    } else {
-      /* Continue jumping through the list */
-      path_select_list = path_select_list->name_next;
-    }
-  }
-
-  path_select_list = temp_list;
-
-  if (! path_select_list && ignore_missing == true) {
-    result = STATE_OK;
-    if (verbose >= 2) {
-      printf ("None of the provided paths were found\n");
-    }
-  }
-
-  /* Process for every path in list */
-  for (path = path_select_list; path; path=path->name_next) {
-    if (verbose >= 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL)
-      printf("Thresholds(pct) for %s warn: %f crit %f\n",
-        path->name,
-        path->freespace_percent->warning->end,
-        path->freespace_percent->critical->end);
-
-    if (verbose >= 3 && path->group != NULL)
-      printf("Group of %s: %s\n",path->name,path->group);
-
-    /* reset disk result */
-    disk_result = STATE_UNKNOWN;
-
-    me = path->best_match;
-
-    if (!me) {
-      continue;
-    }
+        output = strdup("");
+        ignored = strdup("");
+        details = strdup("");
+        perf = strdup("");
+        perf_ilabel = strdup("");
+        stat_buf = malloc(sizeof *stat_buf);
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        mount_list = read_file_system_list(0);
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
+
+        /* If a list of paths has not been selected, find entire
+           mount list and create list of paths
+         */
+        if (path_selected == false && path_ignored == false) {
+                for (me = mount_list; me; me = me->me_next) {
+                        if (!(path = np_find_parameter(path_select_list, me->me_mountdir))) {
+                                path = np_add_parameter(&path_select_list, me->me_mountdir);
+                        }
+                        path->best_match = me;
+                        path->group = group;
+                        set_all_thresholds(path);
+                }
+        }
+
+        if (path_ignored == false) {
+                np_set_best_match(path_select_list, mount_list, exact_match);
+        }
+
+        /* Error if no match found for specified paths */
+        temp_list = path_select_list;
+
+        while (path_select_list) {
+                if (!path_select_list->best_match && ignore_missing == true) {
+                        /* If the first element will be deleted, the temp_list must be updated with the new start address as well */
+                        if (path_select_list == temp_list) {
+                                temp_list = path_select_list->name_next;
+                        }
+                        /* Add path argument to list of ignored paths to inform about missing paths being ignored and not alerted */
+                        xasprintf(&ignored, "%s %s;", ignored, path_select_list->name);
+                        /* Delete the path from the list so that it is not stat-checked later in the code. */
+                        path_select_list = np_del_parameter(path_select_list, path_select_list->name_prev);
+                } else if (!path_select_list->best_match) {
+                        /* Without --ignore-missing option, exit with Critical state. */
+                        die(STATE_CRITICAL, _("DISK %s: %s not found\n"), _("CRITICAL"), path_select_list->name);
+                } else {
+                        /* Continue jumping through the list */
+                        path_select_list = path_select_list->name_next;
+                }
+        }
+
+        path_select_list = temp_list;
+
+        if (!path_select_list && ignore_missing == true) {
+                result = STATE_OK;
+                if (verbose >= 2) {
+                        printf("None of the provided paths were found\n");
+                }
+        }
+
+        /* Process for every path in list */
+        for (path = path_select_list; path; path = path->name_next) {
+                if (verbose >= 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL)
+                        printf("Thresholds(pct) for %s warn: %f crit %f\n", path->name, path->freespace_percent->warning->end,
+                                   path->freespace_percent->critical->end);
+
+                if (verbose >= 3 && path->group != NULL)
+                        printf("Group of %s: %s\n", path->name, path->group);
+
+                /* reset disk result */
+                disk_result = STATE_UNKNOWN;
+
+                me = path->best_match;
+
+                if (!me) {
+                        continue;
+                }
 
 #ifdef __CYGWIN__
-    if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11)
-        continue;
-    snprintf(mountdir, sizeof(mountdir), "%s:\\", me->me_mountdir + 10);
-    if (GetDriveType(mountdir) != DRIVE_FIXED)
-        me->me_remote = 1;
+                if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11)
+                        continue;
+                snprintf(mountdir, sizeof(mountdir), "%s:\\", me->me_mountdir + 10);
+                if (GetDriveType(mountdir) != DRIVE_FIXED)
+                        me->me_remote = 1;
 #endif
-    /* Filters */
-
-    /* Remove filesystems already seen */
-    if (np_seen_name(seen, me->me_mountdir)) {
-      continue;
-    }
-    np_add_name(&seen, me->me_mountdir);
-
-    if (path->group == NULL) {
-      /* Skip remote filesystems if we're not interested in them */
-      if (me->me_remote && show_local_fs) {
-        if (stat_remote_fs) {
-          if (!stat_path(path) && ignore_missing == true) {
-              result = STATE_OK;
-              xasprintf (&ignored, "%s %s;", ignored, path->name);
-          }
-        }
-        continue;
-      /* Skip pseudo fs's if we haven't asked for all fs's */
-      } else if (me->me_dummy && !show_all_fs) {
-        continue;
-      /* Skip excluded fstypes */
-      } else if (fs_exclude_list && np_find_regmatch (fs_exclude_list, me->me_type)) {
-        continue;
-      /* Skip excluded fs's */
-      } else if (dp_exclude_list &&
-               (np_find_name (dp_exclude_list, me->me_devname) ||
-                np_find_name (dp_exclude_list, me->me_mountdir))) {
-        continue;
-      /* Skip not included fstypes */
-      } else if (fs_include_list && !np_find_regmatch(fs_include_list, me->me_type)) {
-        continue;
-      }
-    }
-
-    if (!stat_path(path)) {
-      if (ignore_missing == true) {
-        result = STATE_OK;
-        xasprintf (&ignored, "%s %s;", ignored, path->name);
-      }
-      continue;
-    }
-    get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
-
-    if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
-      get_stats (path, &fsp);
-
-      if (verbose >= 3) {
-        printf ("For %s, used_pct=%f free_pct=%f used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%f free_inodes_pct=%f fsp.fsu_blocksize=%lu mult=%lu\n",
-                me->me_mountdir,
-                path->dused_pct,
-                path->dfree_pct,
-                path->dused_units,
-                path->dfree_units,
-                path->dtotal_units,
-                path->dused_inodes_percent,
-                path->dfree_inodes_percent,
-                fsp.fsu_blocksize,
-                mult);
-      }
-
-      /* Threshold comparisons */
-
-      temp_result = get_status(path->dfree_units, path->freespace_units);
-      if (verbose >=3) printf("Freespace_units result=%d\n", temp_result);
-      disk_result = max_state( disk_result, temp_result );
-
-      temp_result = get_status(path->dfree_pct, path->freespace_percent);
-      if (verbose >=3) printf("Freespace%% result=%d\n", temp_result);
-      disk_result = max_state( disk_result, temp_result );
-
-      temp_result = get_status(path->dused_units, path->usedspace_units);
-      if (verbose >=3) printf("Usedspace_units result=%d\n", temp_result);
-      disk_result = max_state( disk_result, temp_result );
-
-      temp_result = get_status(path->dused_pct, path->usedspace_percent);
-      if (verbose >=3) printf("Usedspace_percent result=%d\n", temp_result);
-      disk_result = max_state( disk_result, temp_result );
-
-      temp_result = get_status(path->dused_inodes_percent, path->usedinodes_percent);
-      if (verbose >=3) printf("Usedinodes_percent result=%d\n", temp_result);
-      disk_result = max_state( disk_result, temp_result );
-
-      temp_result = get_status(path->dfree_inodes_percent, path->freeinodes_percent);
-      if (verbose >=3) printf("Freeinodes_percent result=%d\n", temp_result);
-      disk_result = max_state( disk_result, temp_result );
-
-      result = max_state(result, disk_result);
-
-      /* What a mess of units. The output shows free space, the perf data shows used space. Yikes!
-         Hack here. Trying to get warn/crit levels from freespace_(units|percent) for perf
-         data. Assumption that start=0. Roll on new syntax...
-      */
-
-      /* *_high_tide must be reinitialized at each run */
-      uint64_t warning_high_tide = UINT64_MAX;
-
-      if (path->freespace_units->warning != NULL) {
-        warning_high_tide = (path->dtotal_units - path->freespace_units->warning->end) * mult;
-      }
-      if (path->freespace_percent->warning != NULL) {
-        warning_high_tide = min( warning_high_tide, (uint64_t)((1.0 - path->freespace_percent->warning->end/100) * (path->dtotal_units * mult)) );
-      }
-
-      uint64_t critical_high_tide = UINT64_MAX;
-
-      if (path->freespace_units->critical != NULL) {
-        critical_high_tide = (path->dtotal_units - path->freespace_units->critical->end) * mult;
-      }
-      if (path->freespace_percent->critical != NULL) {
-        critical_high_tide = min( critical_high_tide, (uint64_t)((1.0 - path->freespace_percent->critical->end/100) * (path->dtotal_units * mult)) );
-      }
-
-      /* Nb: *_high_tide are unset when == UINT64_MAX */
-      xasprintf (&perf, "%s %s", perf,
-              perfdata_uint64 (
-                  (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
-                  path->dused_units * mult, "B",
-                  (warning_high_tide == UINT64_MAX ? false : true), warning_high_tide,
-                  (critical_high_tide == UINT64_MAX ? false : true), critical_high_tide,
-                  true, 0,
-                  true, path->dtotal_units * mult));
-
-      if (display_inodes_perfdata) {
-        /* *_high_tide must be reinitialized at each run */
-        warning_high_tide = UINT64_MAX;
-        critical_high_tide = UINT64_MAX;
-
-        if (path->freeinodes_percent->warning != NULL) {
-          warning_high_tide = (uint64_t) fabs( min( (double) warning_high_tide, (double) (1.0 - path->freeinodes_percent->warning->end/100)*path->inodes_total ));
-        }
-        if (path->freeinodes_percent->critical != NULL) {
-          critical_high_tide = (uint64_t) fabs( min( (double) critical_high_tide, (double) (1.0 - path->freeinodes_percent->critical->end/100)*path->inodes_total ));
-        }
-
-        xasprintf (&perf_ilabel, "%s (inodes)", (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
-        /* Nb: *_high_tide are unset when == UINT64_MAX */
-        xasprintf (&perf, "%s %s", perf,
-                perfdata_uint64 (perf_ilabel,
-                    path->inodes_used, "",
-                    (warning_high_tide != UINT64_MAX ? true : false), warning_high_tide,
-                    (critical_high_tide != UINT64_MAX ? true : false), critical_high_tide,
-                    true, 0,
-                    true, path->inodes_total));
-      }
-
-      if (disk_result==STATE_OK && erronly && !verbose)
-        continue;
-
-          if(disk_result && verbose >= 1) {
-                  xasprintf(&flag_header, " %s [", state_text (disk_result));
-          } else {
-                  xasprintf(&flag_header, "");
-          }
-          xasprintf (&output, "%s%s %s %llu%s (%.1f%%",
-                          output, flag_header,
-                          (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
-                          path->dfree_units,
-                          units,
-                          path->dfree_pct);
-          if (path->dused_inodes_percent < 0) {
-                  xasprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : ""));
-          } else {
-                  xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : ""));
-          }
-      free(flag_header);
-    }
-  }
-
-  if (verbose >= 2)
-    xasprintf (&output, "%s%s", output, details);
-
-  if (strcmp(output, "") == 0 && ! erronly) {
-    preamble = "";
-    xasprintf (&output, " - No disks were found for provided parameters");
-  }
-
-  printf ("DISK %s%s%s%s%s|%s\n", state_text (result), ((erronly && result==STATE_OK)) ? "" : preamble, output, (strcmp(ignored, "") == 0) ? "" : ignored_preamble, ignored, perf);
-  return result;
-}
+                /* Filters */
+
+                /* Remove filesystems already seen */
+                if (np_seen_name(seen, me->me_mountdir)) {
+                        continue;
+                }
+                np_add_name(&seen, me->me_mountdir);
+
+                if (path->group == NULL) {
+                        /* Skip remote filesystems if we're not interested in them */
+                        if (me->me_remote && show_local_fs) {
+                                if (stat_remote_fs) {
+                                        if (!stat_path(path) && ignore_missing == true) {
+                                                result = STATE_OK;
+                                                xasprintf(&ignored, "%s %s;", ignored, path->name);
+                                        }
+                                }
+                                continue;
+                                /* Skip pseudo fs's if we haven't asked for all fs's */
+                        }
+                        if (me->me_dummy && !show_all_fs) {
+                                continue;
+                                /* Skip excluded fstypes */
+                        }
+                        if (fs_exclude_list && np_find_regmatch(fs_exclude_list, me->me_type)) {
+                                continue;
+                                /* Skip excluded fs's */
+                        }
+                        if (dp_exclude_list && (np_find_name(dp_exclude_list, me->me_devname) || np_find_name(dp_exclude_list, me->me_mountdir))) {
+                                continue;
+                                /* Skip not included fstypes */
+                        }
+                        if (fs_include_list && !np_find_regmatch(fs_include_list, me->me_type)) {
+                                continue;
+                        }
+                }
+
+                if (!stat_path(path)) {
+                        if (ignore_missing == true) {
+                                result = STATE_OK;
+                                xasprintf(&ignored, "%s %s;", ignored, path->name);
+                        }
+                        continue;
+                }
+                get_fs_usage(me->me_mountdir, me->me_devname, &fsp);
+
+                if (fsp.fsu_blocks && strcmp("none", me->me_mountdir)) {
+                        get_stats(path, &fsp);
+
+                        if (verbose >= 3) {
+                                printf("For %s, used_pct=%f free_pct=%f used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%f "
+                                           "free_inodes_pct=%f fsp.fsu_blocksize=%lu mult=%lu\n",
+                                           me->me_mountdir, path->dused_pct, path->dfree_pct, path->dused_units, path->dfree_units, path->dtotal_units,
+                                           path->dused_inodes_percent, path->dfree_inodes_percent, fsp.fsu_blocksize, mult);
+                        }
+
+                        /* Threshold comparisons */
+
+                        temp_result = get_status(path->dfree_units, path->freespace_units);
+                        if (verbose >= 3)
+                                printf("Freespace_units result=%d\n", temp_result);
+                        disk_result = max_state(disk_result, temp_result);
 
+                        temp_result = get_status(path->dfree_pct, path->freespace_percent);
+                        if (verbose >= 3)
+                                printf("Freespace%% result=%d\n", temp_result);
+                        disk_result = max_state(disk_result, temp_result);
+
+                        temp_result = get_status(path->dused_units, path->usedspace_units);
+                        if (verbose >= 3)
+                                printf("Usedspace_units result=%d\n", temp_result);
+                        disk_result = max_state(disk_result, temp_result);
+
+                        temp_result = get_status(path->dused_pct, path->usedspace_percent);
+                        if (verbose >= 3)
+                                printf("Usedspace_percent result=%d\n", temp_result);
+                        disk_result = max_state(disk_result, temp_result);
+
+                        temp_result = get_status(path->dused_inodes_percent, path->usedinodes_percent);
+                        if (verbose >= 3)
+                                printf("Usedinodes_percent result=%d\n", temp_result);
+                        disk_result = max_state(disk_result, temp_result);
+
+                        temp_result = get_status(path->dfree_inodes_percent, path->freeinodes_percent);
+                        if (verbose >= 3)
+                                printf("Freeinodes_percent result=%d\n", temp_result);
+                        disk_result = max_state(disk_result, temp_result);
+
+                        result = max_state(result, disk_result);
+
+                        /* What a mess of units. The output shows free space, the perf data shows used space. Yikes!
+                           Hack here. Trying to get warn/crit levels from freespace_(units|percent) for perf
+                           data. Assumption that start=0. Roll on new syntax...
+                        */
+
+                        /* *_high_tide must be reinitialized at each run */
+                        uint64_t warning_high_tide = UINT64_MAX;
+
+                        if (path->freespace_units->warning != NULL) {
+                                warning_high_tide = (path->dtotal_units - path->freespace_units->warning->end) * mult;
+                        }
+                        if (path->freespace_percent->warning != NULL) {
+                                warning_high_tide =
+                                        min(warning_high_tide, (uint64_t)((1.0 - path->freespace_percent->warning->end / 100) * (path->dtotal_units * mult)));
+                        }
+
+                        uint64_t critical_high_tide = UINT64_MAX;
+
+                        if (path->freespace_units->critical != NULL) {
+                                critical_high_tide = (path->dtotal_units - path->freespace_units->critical->end) * mult;
+                        }
+                        if (path->freespace_percent->critical != NULL) {
+                                critical_high_tide =
+                                        min(critical_high_tide, (uint64_t)((1.0 - path->freespace_percent->critical->end / 100) * (path->dtotal_units * mult)));
+                        }
+
+                        /* Nb: *_high_tide are unset when == UINT64_MAX */
+                        xasprintf(&perf, "%s %s", perf,
+                                          perfdata_uint64((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+                                                                          path->dused_units * mult, "B", (warning_high_tide == UINT64_MAX ? false : true), warning_high_tide,
+                                                                          (critical_high_tide == UINT64_MAX ? false : true), critical_high_tide, true, 0, true,
+                                                                          path->dtotal_units * mult));
+
+                        if (display_inodes_perfdata) {
+                                /* *_high_tide must be reinitialized at each run */
+                                warning_high_tide = UINT64_MAX;
+                                critical_high_tide = UINT64_MAX;
+
+                                if (path->freeinodes_percent->warning != NULL) {
+                                        warning_high_tide = (uint64_t)fabs(
+                                                min((double)warning_high_tide, (double)(1.0 - path->freeinodes_percent->warning->end / 100) * path->inodes_total));
+                                }
+                                if (path->freeinodes_percent->critical != NULL) {
+                                        critical_high_tide = (uint64_t)fabs(min(
+                                                (double)critical_high_tide, (double)(1.0 - path->freeinodes_percent->critical->end / 100) * path->inodes_total));
+                                }
+
+                                xasprintf(&perf_ilabel, "%s (inodes)",
+                                                  (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
+                                /* Nb: *_high_tide are unset when == UINT64_MAX */
+                                xasprintf(&perf, "%s %s", perf,
+                                                  perfdata_uint64(perf_ilabel, path->inodes_used, "", (warning_high_tide != UINT64_MAX ? true : false),
+                                                                                  warning_high_tide, (critical_high_tide != UINT64_MAX ? true : false), critical_high_tide, true, 0,
+                                                                                  true, path->inodes_total));
+                        }
+
+                        if (disk_result == STATE_OK && erronly && !verbose)
+                                continue;
+
+                        if (disk_result && verbose >= 1) {
+                                xasprintf(&flag_header, " %s [", state_text(disk_result));
+                        } else {
+                                xasprintf(&flag_header, "");
+                        }
+                        xasprintf(&output, "%s%s %s %llu%s (%.1f%%", output, flag_header,
+                                          (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, path->dfree_units, units,
+                                          path->dfree_pct);
+                        if (path->dused_inodes_percent < 0) {
+                                xasprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : ""));
+                        } else {
+                                xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : ""));
+                        }
+                        free(flag_header);
+                }
+        }
+
+        if (verbose >= 2)
+                xasprintf(&output, "%s%s", output, details);
+
+        if (strcmp(output, "") == 0 && !erronly) {
+                preamble = "";
+                xasprintf(&output, " - No disks were found for provided parameters");
+        }
+
+        printf("DISK %s%s%s%s%s|%s\n", state_text(result), ((erronly && result == STATE_OK)) ? "" : preamble, output,
+                   (strcmp(ignored, "") == 0) ? "" : ignored_preamble, ignored, perf);
+        return result;
+}
 
 double calculate_percent(uintmax_t value, uintmax_t total) {
-  double pct = -1;
-  if(value <= DBL_MAX && total != 0) {
-    pct = (double)value / total * 100.0;
-  }
-  return pct;
+        double pct = -1;
+        if (value <= DBL_MAX && total != 0) {
+                pct = (double)value / total * 100.0;
+        }
+        return pct;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c, err;
-  struct parameter_list *se;
-  struct parameter_list *temp_list = NULL, *previous = NULL;
-  struct mount_entry *me;
-  regex_t re;
-  int cflags = REG_NOSUB | REG_EXTENDED;
-  int default_cflags = cflags;
-  char errbuf[MAX_INPUT_BUFFER];
-  int fnd = 0;
-
-  int option = 0;
-  static struct option longopts[] = {
-    {"timeout", required_argument, 0, 't'},
-    {"warning", required_argument, 0, 'w'},
-    {"critical", required_argument, 0, 'c'},
-    {"iwarning", required_argument, 0, 'W'},
-    /* Dang, -C is taken. We might want to reshuffle this. */
-    {"icritical", required_argument, 0, 'K'},
-    {"kilobytes", no_argument, 0, 'k'},
-    {"megabytes", no_argument, 0, 'm'},
-    {"units", required_argument, 0, 'u'},
-    {"path", required_argument, 0, 'p'},
-    {"partition", required_argument, 0, 'p'},
-    {"exclude_device", required_argument, 0, 'x'},
-    {"exclude-type", required_argument, 0, 'X'},
-    {"include-type", required_argument, 0, 'N'},
-    {"group", required_argument, 0, 'g'},
-    {"eregi-path", required_argument, 0, 'R'},
-    {"eregi-partition", required_argument, 0, 'R'},
-    {"ereg-path", required_argument, 0, 'r'},
-    {"ereg-partition", required_argument, 0, 'r'},
-    {"freespace-ignore-reserved", no_argument, 0, 'f'},
-    {"ignore-ereg-path", required_argument, 0, 'i'},
-    {"ignore-ereg-partition", required_argument, 0, 'i'},
-    {"ignore-eregi-path", required_argument, 0, 'I'},
-    {"ignore-eregi-partition", required_argument, 0, 'I'},
-    {"ignore-missing", no_argument, 0, 'n'},
-    {"local", no_argument, 0, 'l'},
-    {"stat-remote-fs", no_argument, 0, 'L'},
-    {"iperfdata", no_argument, 0, 'P'},
-    {"mountpoint", no_argument, 0, 'M'},
-    {"errors-only", no_argument, 0, 'e'},
-    {"exact-match", no_argument, 0, 'E'},
-    {"all", no_argument, 0, 'A'},
-    {"verbose", no_argument, 0, 'v'},
-    {"quiet", no_argument, 0, 'q'},
-    {"clear", no_argument, 0, 'C'},
-    {"version", no_argument, 0, 'V'},
-    {"help", no_argument, 0, 'h'},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  np_add_regex(&fs_exclude_list, "iso9660", REG_EXTENDED);
-
-  for (c = 1; c < argc; c++)
-    if (strcmp ("-to", argv[c]) == 0)
-      strcpy (argv[c], "-t");
-
-  while (1) {
-    c = getopt_long (argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 't':                 /* timeout period */
-      if (is_integer (optarg)) {
-        timeout_interval = atoi (optarg);
-        break;
-      }
-      else {
-        usage2 (_("Timeout interval must be a positive integer"), optarg);
-      }
-
-    /* See comments for 'c' */
-    case 'w':                 /* warning threshold */
+int process_arguments(int argc, char **argv) {
+        int c;
+        int err;
+        struct parameter_list *se;
+        struct parameter_list *temp_list = NULL;
+        struct parameter_list *previous = NULL;
+        struct mount_entry *me;
+        regex_t re;
+        int cflags = REG_NOSUB | REG_EXTENDED;
+        int default_cflags = cflags;
+        char errbuf[MAX_INPUT_BUFFER];
+        int fnd = 0;
+
+        int option = 0;
+        static struct option longopts[] = {{"timeout", required_argument, 0, 't'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"iwarning", required_argument, 0, 'W'},
+                                                                           /* Dang, -C is taken. We might want to reshuffle this. */
+                                                                           {"icritical", required_argument, 0, 'K'},
+                                                                           {"kilobytes", no_argument, 0, 'k'},
+                                                                           {"megabytes", no_argument, 0, 'm'},
+                                                                           {"units", required_argument, 0, 'u'},
+                                                                           {"path", required_argument, 0, 'p'},
+                                                                           {"partition", required_argument, 0, 'p'},
+                                                                           {"exclude_device", required_argument, 0, 'x'},
+                                                                           {"exclude-type", required_argument, 0, 'X'},
+                                                                           {"include-type", required_argument, 0, 'N'},
+                                                                           {"group", required_argument, 0, 'g'},
+                                                                           {"eregi-path", required_argument, 0, 'R'},
+                                                                           {"eregi-partition", required_argument, 0, 'R'},
+                                                                           {"ereg-path", required_argument, 0, 'r'},
+                                                                           {"ereg-partition", required_argument, 0, 'r'},
+                                                                           {"freespace-ignore-reserved", no_argument, 0, 'f'},
+                                                                           {"ignore-ereg-path", required_argument, 0, 'i'},
+                                                                           {"ignore-ereg-partition", required_argument, 0, 'i'},
+                                                                           {"ignore-eregi-path", required_argument, 0, 'I'},
+                                                                           {"ignore-eregi-partition", required_argument, 0, 'I'},
+                                                                           {"ignore-missing", no_argument, 0, 'n'},
+                                                                           {"local", no_argument, 0, 'l'},
+                                                                           {"stat-remote-fs", no_argument, 0, 'L'},
+                                                                           {"iperfdata", no_argument, 0, 'P'},
+                                                                           {"mountpoint", no_argument, 0, 'M'},
+                                                                           {"errors-only", no_argument, 0, 'e'},
+                                                                           {"exact-match", no_argument, 0, 'E'},
+                                                                           {"all", no_argument, 0, 'A'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"quiet", no_argument, 0, 'q'},
+                                                                           {"clear", no_argument, 0, 'C'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2)
+                return ERROR;
+
+        np_add_regex(&fs_exclude_list, "iso9660", REG_EXTENDED);
+
+        for (c = 1; c < argc; c++)
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+
+        while (1) {
+                c = getopt_long(argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case 't': /* timeout period */
+                        if (is_integer(optarg)) {
+                                timeout_interval = atoi(optarg);
+                                break;
+                        } else {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        }
+
+                /* See comments for 'c' */
+                case 'w': /* warning threshold */
                         if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
-                                        die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg);
+                                die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg);
                         }
 
-      if (strstr(optarg, "%")) {
-        if (*optarg == '@') {
-          warn_freespace_percent = optarg;
-        } else {
-          xasprintf(&warn_freespace_percent, "@%s", optarg);
-        }
-      } else {
-        if (*optarg == '@') {
-          warn_freespace_units = optarg;
-        } else {
-          xasprintf(&warn_freespace_units, "@%s", optarg);
-        }
-      }
-      break;
-
-    /* Awful mistake where the range values do not make sense. Normally,
-       you alert if the value is within the range, but since we are using
-       freespace, we have to alert if outside the range. Thus we artificially
-       force @ at the beginning of the range, so that it is backwards compatible
-    */
-    case 'c':                 /* critical threshold */
+                        if (strstr(optarg, "%")) {
+                                if (*optarg == '@') {
+                                        warn_freespace_percent = optarg;
+                                } else {
+                                        xasprintf(&warn_freespace_percent, "@%s", optarg);
+                                }
+                        } else {
+                                if (*optarg == '@') {
+                                        warn_freespace_units = optarg;
+                                } else {
+                                        xasprintf(&warn_freespace_units, "@%s", optarg);
+                                }
+                        }
+                        break;
+
+                /* Awful mistake where the range values do not make sense. Normally,
+                   you alert if the value is within the range, but since we are using
+                   freespace, we have to alert if outside the range. Thus we artificially
+                   force @ at the beginning of the range, so that it is backwards compatible
+                */
+                case 'c': /* critical threshold */
                         if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
-                                        die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
+                                die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
                         }
 
-      if (strstr(optarg, "%")) {
-        if (*optarg == '@') {
-          crit_freespace_percent = optarg;
-        } else {
-          xasprintf(&crit_freespace_percent, "@%s", optarg);
-        }
-      } else {
-        if (*optarg == '@') {
-          crit_freespace_units = optarg;
-        } else {
-          xasprintf(&crit_freespace_units, "@%s", optarg);
-        }
-      }
-      break;
-
-    case 'W':            /* warning inode threshold */
-      if (*optarg == '@') {
-        warn_freeinodes_percent = optarg;
-      } else {
-        xasprintf(&warn_freeinodes_percent, "@%s", optarg);
-      }
-      break;
-    case 'K':            /* critical inode threshold */
-      if (*optarg == '@') {
-        crit_freeinodes_percent = optarg;
-      } else {
-        xasprintf(&crit_freeinodes_percent, "@%s", optarg);
-      }
-      break;
-    case 'u':
-      if (units)
-        free(units);
-      if (! strcasecmp (optarg, "bytes")) {
-        mult = (uintmax_t)1;
-        units = strdup ("B");
-      } else if (!strcmp(optarg, "KiB")) {
-        mult = (uintmax_t)1024;
-        units = strdup ("KiB");
-      } else if (! strcmp (optarg, "kB")) {
-        mult = (uintmax_t)1000;
-        units = strdup ("kB");
-      } else if (!strcmp(optarg, "MiB")) {
-        mult = (uintmax_t)1024 * 1024;
-        units = strdup ("MiB");
-      } else if (! strcmp (optarg, "MB")) {
-        mult = (uintmax_t)1000 * 1000;
-        units = strdup ("MB");
-      } else if (!strcmp(optarg, "GiB")) {
-        mult = (uintmax_t)1024 * 1024 * 1024;
-        units = strdup ("GiB");
-      } else if (! strcmp (optarg, "GB")){
-        mult = (uintmax_t)1000 * 1000 * 1000;
-        units = strdup ("GB");
-      } else if (!strcmp(optarg, "TiB")) {
-        mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
-        units = strdup ("TiB");
-      } else if (! strcmp (optarg, "TB")) {
-        mult = (uintmax_t)1000 * 1000 * 1000 * 1000;
-        units = strdup ("TB");
-      } else if (!strcmp(optarg, "PiB")) {
-        mult = (uintmax_t)1024 * 1024 * 1024 * 1024 * 1024;
-        units = strdup ("PiB");
-      } else if (! strcmp (optarg, "PB")){
-        mult = (uintmax_t)1000 * 1000 * 1000 * 1000 * 1000;
-        units = strdup ("PB");
-      } else {
-        die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
-      }
-      if (units == NULL)
-        die (STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
-      break;
-    case 'k': /* display mountpoint */
-      mult = 1024;
-      if (units)
-        free(units);
-      units = strdup ("kiB");
-      break;
-    case 'm': /* display mountpoint */
-      mult = 1024 * 1024;
-      if (units)
-        free(units);
-      units = strdup ("MiB");
-      break;
-    case 'L':
-      stat_remote_fs = 1;
-      /* fallthrough */
-    case 'l':
-      show_local_fs = 1;
-      break;
-    case 'P':
-      display_inodes_perfdata = 1;
-      break;
-    case 'p':                 /* select path */
-      if (! (warn_freespace_units || crit_freespace_units || warn_freespace_percent ||
-             crit_freespace_percent || warn_usedspace_units || crit_usedspace_units ||
-             warn_usedspace_percent || crit_usedspace_percent || warn_usedinodes_percent ||
-             crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent )) {
-        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -p\n"));
-      }
-
-      /* add parameter if not found. overwrite thresholds if path has already been added  */
-      if (! (se = np_find_parameter(path_select_list, optarg))) {
-          se = np_add_parameter(&path_select_list, optarg);
-
-          if (stat(optarg, &stat_buf[0]) && ignore_missing == true) {
-            path_ignored = true;
-            break;
-          }
-      }
-      se->group = group;
-      set_all_thresholds(se);
-
-      /* With autofs, it is required to stat() the path before re-populating the mount_list */
-      if (!stat_path(se)) {
-        break;
-      }
-      /* NB: We can't free the old mount_list "just like that": both list pointers and struct
-       * pointers are copied around. One of the reason it wasn't done yet is that other parts
-       * of check_disk need the same kind of cleanup so it'd better be done as a whole */
-      mount_list = read_file_system_list (0);
-      np_set_best_match(se, mount_list, exact_match);
-
-      path_selected = true;
-      break;
-    case 'x':                 /* exclude path or partition */
-      np_add_name(&dp_exclude_list, optarg);
-      break;
-    case 'X':                 /* exclude file system type */
-      err = np_add_regex(&fs_exclude_list, optarg, REG_EXTENDED);
-      if (err != 0) {
-        regerror (err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
-        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
-      }
-      break;
-    case 'N':                 /* include file system type */
-      err = np_add_regex(&fs_include_list, optarg, REG_EXTENDED);
-      if (err != 0) {
-        regerror (err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
-        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
-      }
-      break;
-    case 'v':                 /* verbose */
-      verbose++;
-      break;
-    case 'q':                 /* TODO: this function should eventually go away (removed 2007-09-20) */
-      /* verbose--; **replaced by line below**. -q was only a broken way of implementing -e */
-      erronly = true;
-      break;
-    case 'e':
-      erronly = true;
-      break;
-    case 'E':
-      if (path_selected)
-        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set -E before selecting paths\n"));
-      exact_match = true;
-      break;
-    case 'f':
-      freespace_ignore_reserved = true;
-      break;
-    case 'g':
-      if (path_selected)
-        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set group value before selecting paths\n"));
-      group = optarg;
-      break;
-    case 'I':
-      cflags |= REG_ICASE;
-          // Intentional fallthrough
-    case 'i':
-      if (!path_selected)
-        die (STATE_UNKNOWN, "DISK %s: %s\n", _("UNKNOWN"), _("Paths need to be selected before using -i/-I. Use -A to select all paths explicitly"));
-      err = regcomp(&re, optarg, cflags);
-      if (err != 0) {
-        regerror (err, &re, errbuf, MAX_INPUT_BUFFER);
-        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
-      }
-
-      temp_list = path_select_list;
-
-      previous = NULL;
-      while (temp_list) {
-        if (temp_list->best_match) {
-          if (np_regex_match_mount_entry(temp_list->best_match, &re)) {
-
-              if (verbose >=3)
-                printf("ignoring %s matching regex\n", temp_list->name);
-
-              temp_list = np_del_parameter(temp_list, previous);
-              /* pointer to first element needs to be updated if first item gets deleted */
-              if (previous == NULL)
-                path_select_list = temp_list;
-          } else {
-            previous = temp_list;
-            temp_list = temp_list->name_next;
-          }
-        } else {
-          previous = temp_list;
-          temp_list = temp_list->name_next;
-        }
-      }
-
-
-      cflags = default_cflags;
-      break;
-
-    case 'n':
-      ignore_missing = true;
-      break;
-    case 'A':
-      optarg = strdup(".*");
-          // Intentional fallthrough
-    case 'R':
-      cflags |= REG_ICASE;
-          // Intentional fallthrough
-    case 'r':
-      if (! (warn_freespace_units || crit_freespace_units || warn_freespace_percent ||
-             crit_freespace_percent || warn_usedspace_units || crit_usedspace_units ||
-             warn_usedspace_percent || crit_usedspace_percent || warn_usedinodes_percent ||
-             crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent )) {
-        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--all)\n"));
-      }
-
-      err = regcomp(&re, optarg, cflags);
-      if (err != 0) {
-        regerror (err, &re, errbuf, MAX_INPUT_BUFFER);
-        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
-      }
-
-      for (me = mount_list; me; me = me->me_next) {
-        if (np_regex_match_mount_entry(me, &re)) {
-          fnd = true;
-          if (verbose >= 3)
-            printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg);
-
-          /* add parameter if not found. overwrite thresholds if path has already been added  */
-          if (! (se = np_find_parameter(path_select_list, me->me_mountdir))) {
-            se = np_add_parameter(&path_select_list, me->me_mountdir);
-          }
-          se->group = group;
-          set_all_thresholds(se);
-        }
-      }
-
-      if (!fnd && ignore_missing == true) {
-        path_ignored = true;
-        path_selected = true;
-        break;
-      } else if (!fnd)
-        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"),
-            _("Regular expression did not match any path or disk"), optarg);
-
-      fnd = false;
-      path_selected = true;
-      np_set_best_match(path_select_list, mount_list, exact_match);
-      cflags = default_cflags;
-
-      break;
-    case 'M': /* display mountpoint */
-      display_mntp = true;
-      break;
-    case 'C':
-       /* add all mount entries to path_select list if no partitions have been explicitly defined using -p */
-       if (path_selected == false) {
-         struct parameter_list *path;
-         for (me = mount_list; me; me = me->me_next) {
-           if (! (path = np_find_parameter(path_select_list, me->me_mountdir)))
-             path = np_add_parameter(&path_select_list, me->me_mountdir);
-           path->best_match = me;
-           path->group = group;
-           set_all_thresholds(path);
-         }
-      }
-      warn_freespace_units = NULL;
-      crit_freespace_units = NULL;
-      warn_usedspace_units = NULL;
-      crit_usedspace_units = NULL;
-      warn_freespace_percent = NULL;
-      crit_freespace_percent = NULL;
-      warn_usedspace_percent = NULL;
-      crit_usedspace_percent = NULL;
-      warn_usedinodes_percent = NULL;
-      crit_usedinodes_percent = NULL;
-      warn_freeinodes_percent = NULL;
-      crit_freeinodes_percent = NULL;
-
-      path_selected = false;
-      group = NULL;
-      break;
-    case 'V':                 /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'h':                 /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case '?':                 /* help */
-      usage (_("Unknown argument"));
-    }
-  }
-
-  /* Support for "check_disk warn crit [fs]" with thresholds at used% level */
-  c = optind;
-  if (warn_usedspace_percent == NULL && argc > c && is_intnonneg (argv[c]))
-    warn_usedspace_percent = argv[c++];
-
-  if (crit_usedspace_percent == NULL && argc > c && is_intnonneg (argv[c]))
-    crit_usedspace_percent = argv[c++];
-
-  if (argc > c) {
-    se = np_add_parameter(&path_select_list, strdup(argv[c++]));
-    path_selected = true;
-    set_all_thresholds(se);
-  }
-
-  if (units == NULL) {
-    units = strdup ("MiB");
-    mult = (uintmax_t)1024 * 1024;
-  }
-
-  return true;
-}
+                        if (strstr(optarg, "%")) {
+                                if (*optarg == '@') {
+                                        crit_freespace_percent = optarg;
+                                } else {
+                                        xasprintf(&crit_freespace_percent, "@%s", optarg);
+                                }
+                        } else {
+                                if (*optarg == '@') {
+                                        crit_freespace_units = optarg;
+                                } else {
+                                        xasprintf(&crit_freespace_units, "@%s", optarg);
+                                }
+                        }
+                        break;
 
-void
-set_all_thresholds (struct parameter_list *path)
-{
-    if (path->freespace_units != NULL) free(path->freespace_units);
-    set_thresholds(&path->freespace_units, warn_freespace_units, crit_freespace_units);
-    if (path->freespace_percent != NULL) free (path->freespace_percent);
-    set_thresholds(&path->freespace_percent, warn_freespace_percent, crit_freespace_percent);
-    if (path->usedspace_units != NULL) free (path->usedspace_units);
-    set_thresholds(&path->usedspace_units, warn_usedspace_units, crit_usedspace_units);
-    if (path->usedspace_percent != NULL) free (path->usedspace_percent);
-    set_thresholds(&path->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent);
-    if (path->usedinodes_percent != NULL) free (path->usedinodes_percent);
-    set_thresholds(&path->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent);
-    if (path->freeinodes_percent != NULL) free (path->freeinodes_percent);
-    set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent);
-}
+                case 'W': /* warning inode threshold */
+                        if (*optarg == '@') {
+                                warn_freeinodes_percent = optarg;
+                        } else {
+                                xasprintf(&warn_freeinodes_percent, "@%s", optarg);
+                        }
+                        break;
+                case 'K': /* critical inode threshold */
+                        if (*optarg == '@') {
+                                crit_freeinodes_percent = optarg;
+                        } else {
+                                xasprintf(&crit_freeinodes_percent, "@%s", optarg);
+                        }
+                        break;
+                case 'u':
+                        if (units)
+                                free(units);
+                        if (!strcasecmp(optarg, "bytes")) {
+                                mult = (uintmax_t)1;
+                                units = strdup("B");
+                        } else if (!strcmp(optarg, "KiB")) {
+                                mult = (uintmax_t)1024;
+                                units = strdup("KiB");
+                        } else if (!strcmp(optarg, "kB")) {
+                                mult = (uintmax_t)1000;
+                                units = strdup("kB");
+                        } else if (!strcmp(optarg, "MiB")) {
+                                mult = (uintmax_t)1024 * 1024;
+                                units = strdup("MiB");
+                        } else if (!strcmp(optarg, "MB")) {
+                                mult = (uintmax_t)1000 * 1000;
+                                units = strdup("MB");
+                        } else if (!strcmp(optarg, "GiB")) {
+                                mult = (uintmax_t)1024 * 1024 * 1024;
+                                units = strdup("GiB");
+                        } else if (!strcmp(optarg, "GB")) {
+                                mult = (uintmax_t)1000 * 1000 * 1000;
+                                units = strdup("GB");
+                        } else if (!strcmp(optarg, "TiB")) {
+                                mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
+                                units = strdup("TiB");
+                        } else if (!strcmp(optarg, "TB")) {
+                                mult = (uintmax_t)1000 * 1000 * 1000 * 1000;
+                                units = strdup("TB");
+                        } else if (!strcmp(optarg, "PiB")) {
+                                mult = (uintmax_t)1024 * 1024 * 1024 * 1024 * 1024;
+                                units = strdup("PiB");
+                        } else if (!strcmp(optarg, "PB")) {
+                                mult = (uintmax_t)1000 * 1000 * 1000 * 1000 * 1000;
+                                units = strdup("PB");
+                        } else {
+                                die(STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+                        }
+                        if (units == NULL)
+                                die(STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
+                        break;
+                case 'k': /* display mountpoint */
+                        mult = 1024;
+                        if (units)
+                                free(units);
+                        units = strdup("kiB");
+                        break;
+                case 'm': /* display mountpoint */
+                        mult = 1024 * 1024;
+                        if (units)
+                                free(units);
+                        units = strdup("MiB");
+                        break;
+                case 'L':
+                        stat_remote_fs = 1;
+                        /* fallthrough */
+                case 'l':
+                        show_local_fs = 1;
+                        break;
+                case 'P':
+                        display_inodes_perfdata = 1;
+                        break;
+                case 'p': /* select path */
+                        if (!(warn_freespace_units || crit_freespace_units || warn_freespace_percent || crit_freespace_percent ||
+                                  warn_usedspace_units || crit_usedspace_units || warn_usedspace_percent || crit_usedspace_percent ||
+                                  warn_usedinodes_percent || crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent)) {
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -p\n"));
+                        }
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
-
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
-
-  printf ("%s\n", _("This plugin checks the amount of used disk space on a mounted file system"));
-  printf ("%s\n", _("and generates an alert if free space is less than one of the threshold values"));
-
-  printf ("\n\n");
-
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
-
-  printf (" %s\n", "-w, --warning=INTEGER");
-  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
-  printf (" %s\n", "-w, --warning=PERCENT%");
-  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
-  printf (" %s\n", "-c, --critical=INTEGER");
-  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
-  printf (" %s\n", "-c, --critical=PERCENT%");
-  printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of disk space is free"));
-  printf (" %s\n", "-W, --iwarning=PERCENT%");
-  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
-  printf (" %s\n", "-K, --icritical=PERCENT%");
-  printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
-  printf (" %s\n", "-p, --path=PATH, --partition=PARTITION");
-  printf ("    %s\n", _("Mount point or block device as emitted by the mount(8) command (may be repeated)"));
-  printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
-  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
-  printf (" %s\n", "-C, --clear");
-  printf ("    %s\n", _("Clear thresholds"));
-  printf (" %s\n", "-E, --exact-match");
-  printf ("    %s\n", _("For paths or partitions specified with -p, only check for exact paths"));
-  printf (" %s\n", "-e, --errors-only");
-  printf ("    %s\n", _("Display only devices/mountpoints with errors"));
-  printf (" %s\n", "-f, --freespace-ignore-reserved");
-  printf ("    %s\n", _("Don't account root-reserved blocks into freespace in perfdata"));
-  printf (" %s\n", "-P, --iperfdata");
-  printf ("    %s\n", _("Display inode usage in perfdata"));
-  printf (" %s\n", "-g, --group=NAME");
-  printf ("    %s\n", _("Group paths. Thresholds apply to (free-)space of all partitions together"));
-  printf (" %s\n", "-k, --kilobytes");
-  printf ("    %s\n", _("Same as '--units kB'"));
-  printf (" %s\n", "-l, --local");
-  printf ("    %s\n", _("Only check local filesystems"));
-  printf (" %s\n", "-L, --stat-remote-fs");
-  printf ("    %s\n", _("Only check local filesystems against thresholds. Yet call stat on remote filesystems"));
-  printf ("    %s\n", _("to test if they are accessible (e.g. to detect Stale NFS Handles)"));
-  printf (" %s\n", "-M, --mountpoint");
-  printf ("    %s\n", _("Display the (block) device instead of the mount point"));
-  printf (" %s\n", "-m, --megabytes");
-  printf ("    %s\n", _("Same as '--units MB'"));
-  printf (" %s\n", "-A, --all");
-  printf ("    %s\n", _("Explicitly select all paths. This is equivalent to -R '.*'"));
-  printf (" %s\n", "-R, --eregi-path=PATH, --eregi-partition=PARTITION");
-  printf ("    %s\n", _("Case insensitive regular expression for path/partition (may be repeated)"));
-  printf (" %s\n", "-r, --ereg-path=PATH, --ereg-partition=PARTITION");
-  printf ("    %s\n", _("Regular expression for path or partition (may be repeated)"));
-  printf (" %s\n", "-I, --ignore-eregi-path=PATH, --ignore-eregi-partition=PARTITION");
-  printf ("    %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)"));
-  printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION");
-  printf ("    %s\n", _("Regular expression to ignore selected path or partition (may be repeated)"));
-  printf (" %s\n", "-n, --ignore-missing");
-  printf ("    %s\n", _("Return OK if no filesystem matches, filesystem does not exist or is inaccessible."));
-  printf ("    %s\n", _("(Provide this option before -p / -r / --ereg-path if used)"));
-  printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-  printf (" %s\n", "-u, --units=STRING");
-  printf ("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
-  printf (UT_VERBOSE);
-  printf (" %s\n", "-X, --exclude-type=TYPE_REGEX");
-  printf ("    %s\n", _("Ignore all filesystems of types matching given regex(7) (may be repeated)"));
-  printf (" %s\n", "-N, --include-type=TYPE_REGEX");
-  printf ("    %s\n", _("Check only filesystems where the type matches this given regex(7) (may be repeated)"));
-
-  printf ("\n");
-  printf ("%s\n", _("General usage hints:"));
-  printf (" %s\n", _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as"));
-  printf ("   %s\n", _("\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"."));
-  printf (" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} {thresholds b} ...\""));
-
-
-
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
-  printf ("    %s\n\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
-  printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'");
-  printf ("    %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex"));
-  printf ("    %s\n\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
-  printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -p /foo -C -w 5% -c 3% -p /bar");
-  printf ("    %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
-
-  printf (UT_SUPPORT);
-}
+                        /* add parameter if not found. overwrite thresholds if path has already been added  */
+                        if (!(se = np_find_parameter(path_select_list, optarg))) {
+                                se = np_add_parameter(&path_select_list, optarg);
+
+                                if (stat(optarg, &stat_buf[0]) && ignore_missing == true) {
+                                        path_ignored = true;
+                                        break;
+                                }
+                        }
+                        se->group = group;
+                        set_all_thresholds(se);
+
+                        /* With autofs, it is required to stat() the path before re-populating the mount_list */
+                        if (!stat_path(se)) {
+                                break;
+                        }
+                        /* NB: We can't free the old mount_list "just like that": both list pointers and struct
+                         * pointers are copied around. One of the reason it wasn't done yet is that other parts
+                         * of check_disk need the same kind of cleanup so it'd better be done as a whole */
+                        mount_list = read_file_system_list(0);
+                        np_set_best_match(se, mount_list, exact_match);
+
+                        path_selected = true;
+                        break;
+                case 'x': /* exclude path or partition */
+                        np_add_name(&dp_exclude_list, optarg);
+                        break;
+                case 'X': /* exclude file system type */
+                        err = np_add_regex(&fs_exclude_list, optarg, REG_EXTENDED);
+                        if (err != 0) {
+                                regerror(err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                        }
+                        break;
+                case 'N': /* include file system type */
+                        err = np_add_regex(&fs_include_list, optarg, REG_EXTENDED);
+                        if (err != 0) {
+                                regerror(err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                        }
+                        break;
+                case 'v': /* verbose */
+                        verbose++;
+                        break;
+                case 'q': /* TODO: this function should eventually go away (removed 2007-09-20) */
+                        /* verbose--; **replaced by line below**. -q was only a broken way of implementing -e */
+                        erronly = true;
+                        break;
+                case 'e':
+                        erronly = true;
+                        break;
+                case 'E':
+                        if (path_selected)
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set -E before selecting paths\n"));
+                        exact_match = true;
+                        break;
+                case 'f':
+                        freespace_ignore_reserved = true;
+                        break;
+                case 'g':
+                        if (path_selected)
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set group value before selecting paths\n"));
+                        group = optarg;
+                        break;
+                case 'I':
+                        cflags |= REG_ICASE;
+                        // Intentional fallthrough
+                case 'i':
+                        if (!path_selected)
+                                die(STATE_UNKNOWN, "DISK %s: %s\n", _("UNKNOWN"),
+                                        _("Paths need to be selected before using -i/-I. Use -A to select all paths explicitly"));
+                        err = regcomp(&re, optarg, cflags);
+                        if (err != 0) {
+                                regerror(err, &re, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                        }
+
+                        temp_list = path_select_list;
+
+                        previous = NULL;
+                        while (temp_list) {
+                                if (temp_list->best_match) {
+                                        if (np_regex_match_mount_entry(temp_list->best_match, &re)) {
+
+                                                if (verbose >= 3)
+                                                        printf("ignoring %s matching regex\n", temp_list->name);
+
+                                                temp_list = np_del_parameter(temp_list, previous);
+                                                /* pointer to first element needs to be updated if first item gets deleted */
+                                                if (previous == NULL)
+                                                        path_select_list = temp_list;
+                                        } else {
+                                                previous = temp_list;
+                                                temp_list = temp_list->name_next;
+                                        }
+                                } else {
+                                        previous = temp_list;
+                                        temp_list = temp_list->name_next;
+                                }
+                        }
 
+                        cflags = default_cflags;
+                        break;
+
+                case 'n':
+                        ignore_missing = true;
+                        break;
+                case 'A':
+                        optarg = strdup(".*");
+                        // Intentional fallthrough
+                case 'R':
+                        cflags |= REG_ICASE;
+                        // Intentional fallthrough
+                case 'r':
+                        if (!(warn_freespace_units || crit_freespace_units || warn_freespace_percent || crit_freespace_percent ||
+                                  warn_usedspace_units || crit_usedspace_units || warn_usedspace_percent || crit_usedspace_percent ||
+                                  warn_usedinodes_percent || crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent)) {
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"),
+                                        _("Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--all)\n"));
+                        }
 
+                        err = regcomp(&re, optarg, cflags);
+                        if (err != 0) {
+                                regerror(err, &re, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                        }
+
+                        for (me = mount_list; me; me = me->me_next) {
+                                if (np_regex_match_mount_entry(me, &re)) {
+                                        fnd = true;
+                                        if (verbose >= 3)
+                                                printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg);
+
+                                        /* add parameter if not found. overwrite thresholds if path has already been added  */
+                                        if (!(se = np_find_parameter(path_select_list, me->me_mountdir))) {
+                                                se = np_add_parameter(&path_select_list, me->me_mountdir);
+                                        }
+                                        se->group = group;
+                                        set_all_thresholds(se);
+                                }
+                        }
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s {-w absolute_limit |-w  percentage_limit%% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit%% | -K inode_percentage_limit } {-p path | -x device}\n", progname);
-  printf ("[-C] [-E] [-e] [-f] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n");
-  printf ("[-t timeout] [-u unit] [-v] [-X type_regex] [-N type]\n");
+                        if (!fnd && ignore_missing == true) {
+                                path_ignored = true;
+                                path_selected = true;
+                                break;
+                        }
+                        if (!fnd)
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Regular expression did not match any path or disk"), optarg);
+
+                        fnd = false;
+                        path_selected = true;
+                        np_set_best_match(path_select_list, mount_list, exact_match);
+                        cflags = default_cflags;
+
+                        break;
+                case 'M': /* display mountpoint */
+                        display_mntp = true;
+                        break;
+                case 'C':
+                        /* add all mount entries to path_select list if no partitions have been explicitly defined using -p */
+                        if (path_selected == false) {
+                                struct parameter_list *path;
+                                for (me = mount_list; me; me = me->me_next) {
+                                        if (!(path = np_find_parameter(path_select_list, me->me_mountdir)))
+                                                path = np_add_parameter(&path_select_list, me->me_mountdir);
+                                        path->best_match = me;
+                                        path->group = group;
+                                        set_all_thresholds(path);
+                                }
+                        }
+                        warn_freespace_units = NULL;
+                        crit_freespace_units = NULL;
+                        warn_usedspace_units = NULL;
+                        crit_usedspace_units = NULL;
+                        warn_freespace_percent = NULL;
+                        crit_freespace_percent = NULL;
+                        warn_usedspace_percent = NULL;
+                        crit_usedspace_percent = NULL;
+                        warn_usedinodes_percent = NULL;
+                        crit_usedinodes_percent = NULL;
+                        warn_freeinodes_percent = NULL;
+                        crit_freeinodes_percent = NULL;
+
+                        path_selected = false;
+                        group = NULL;
+                        break;
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage(_("Unknown argument"));
+                }
+        }
+
+        /* Support for "check_disk warn crit [fs]" with thresholds at used% level */
+        c = optind;
+        if (warn_usedspace_percent == NULL && argc > c && is_intnonneg(argv[c]))
+                warn_usedspace_percent = argv[c++];
+
+        if (crit_usedspace_percent == NULL && argc > c && is_intnonneg(argv[c]))
+                crit_usedspace_percent = argv[c++];
+
+        if (argc > c) {
+                se = np_add_parameter(&path_select_list, strdup(argv[c++]));
+                path_selected = true;
+                set_all_thresholds(se);
+        }
+
+        if (units == NULL) {
+                units = strdup("MiB");
+                mult = (uintmax_t)1024 * 1024;
+        }
+
+        return true;
 }
 
-bool
-stat_path (struct parameter_list *p)
-{
-  /* Stat entry to check that dir exists and is accessible */
-  if (verbose >= 3)
-    printf("calling stat on %s\n", p->name);
-  if (stat (p->name, &stat_buf[0])) {
-    if (verbose >= 3)
-      printf("stat failed on %s\n", p->name);
-    if (ignore_missing == true) {
-      return false;
-    } else {
-      printf("DISK %s - ", _("CRITICAL"));
-      die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno));
-    }
-  }
-  return true;
+void set_all_thresholds(struct parameter_list *path) {
+        if (path->freespace_units != NULL)
+                free(path->freespace_units);
+        set_thresholds(&path->freespace_units, warn_freespace_units, crit_freespace_units);
+        if (path->freespace_percent != NULL)
+                free(path->freespace_percent);
+        set_thresholds(&path->freespace_percent, warn_freespace_percent, crit_freespace_percent);
+        if (path->usedspace_units != NULL)
+                free(path->usedspace_units);
+        set_thresholds(&path->usedspace_units, warn_usedspace_units, crit_usedspace_units);
+        if (path->usedspace_percent != NULL)
+                free(path->usedspace_percent);
+        set_thresholds(&path->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent);
+        if (path->usedinodes_percent != NULL)
+                free(path->usedinodes_percent);
+        set_thresholds(&path->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent);
+        if (path->freeinodes_percent != NULL)
+                free(path->freeinodes_percent);
+        set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent);
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf("%s\n", _("This plugin checks the amount of used disk space on a mounted file system"));
+        printf("%s\n", _("and generates an alert if free space is less than one of the threshold values"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
+        printf(" %s\n", "-w, --warning=PERCENT%");
+        printf("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
+        printf(" %s\n", "-c, --critical=PERCENT%");
+        printf("    %s\n", _("Exit with CRITICAL status if less than PERCENT of disk space is free"));
+        printf(" %s\n", "-W, --iwarning=PERCENT%");
+        printf("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
+        printf(" %s\n", "-K, --icritical=PERCENT%");
+        printf("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
+        printf(" %s\n", "-p, --path=PATH, --partition=PARTITION");
+        printf("    %s\n", _("Mount point or block device as emitted by the mount(8) command (may be repeated)"));
+        printf(" %s\n", "-x, --exclude_device=PATH <STRING>");
+        printf("    %s\n", _("Ignore device (only works if -p unspecified)"));
+        printf(" %s\n", "-C, --clear");
+        printf("    %s\n", _("Clear thresholds"));
+        printf(" %s\n", "-E, --exact-match");
+        printf("    %s\n", _("For paths or partitions specified with -p, only check for exact paths"));
+        printf(" %s\n", "-e, --errors-only");
+        printf("    %s\n", _("Display only devices/mountpoints with errors"));
+        printf(" %s\n", "-f, --freespace-ignore-reserved");
+        printf("    %s\n", _("Don't account root-reserved blocks into freespace in perfdata"));
+        printf(" %s\n", "-P, --iperfdata");
+        printf("    %s\n", _("Display inode usage in perfdata"));
+        printf(" %s\n", "-g, --group=NAME");
+        printf("    %s\n", _("Group paths. Thresholds apply to (free-)space of all partitions together"));
+        printf(" %s\n", "-k, --kilobytes");
+        printf("    %s\n", _("Same as '--units kB'"));
+        printf(" %s\n", "-l, --local");
+        printf("    %s\n", _("Only check local filesystems"));
+        printf(" %s\n", "-L, --stat-remote-fs");
+        printf("    %s\n", _("Only check local filesystems against thresholds. Yet call stat on remote filesystems"));
+        printf("    %s\n", _("to test if they are accessible (e.g. to detect Stale NFS Handles)"));
+        printf(" %s\n", "-M, --mountpoint");
+        printf("    %s\n", _("Display the (block) device instead of the mount point"));
+        printf(" %s\n", "-m, --megabytes");
+        printf("    %s\n", _("Same as '--units MB'"));
+        printf(" %s\n", "-A, --all");
+        printf("    %s\n", _("Explicitly select all paths. This is equivalent to -R '.*'"));
+        printf(" %s\n", "-R, --eregi-path=PATH, --eregi-partition=PARTITION");
+        printf("    %s\n", _("Case insensitive regular expression for path/partition (may be repeated)"));
+        printf(" %s\n", "-r, --ereg-path=PATH, --ereg-partition=PARTITION");
+        printf("    %s\n", _("Regular expression for path or partition (may be repeated)"));
+        printf(" %s\n", "-I, --ignore-eregi-path=PATH, --ignore-eregi-partition=PARTITION");
+        printf("    %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)"));
+        printf(" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION");
+        printf("    %s\n", _("Regular expression to ignore selected path or partition (may be repeated)"));
+        printf(" %s\n", "-n, --ignore-missing");
+        printf("    %s\n", _("Return OK if no filesystem matches, filesystem does not exist or is inaccessible."));
+        printf("    %s\n", _("(Provide this option before -p / -r / --ereg-path if used)"));
+        printf(UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(" %s\n", "-u, --units=STRING");
+        printf("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
+        printf(UT_VERBOSE);
+        printf(" %s\n", "-X, --exclude-type=TYPE_REGEX");
+        printf("    %s\n", _("Ignore all filesystems of types matching given regex(7) (may be repeated)"));
+        printf(" %s\n", "-N, --include-type=TYPE_REGEX");
+        printf("    %s\n", _("Check only filesystems where the type matches this given regex(7) (may be repeated)"));
+
+        printf("\n");
+        printf("%s\n", _("General usage hints:"));
+        printf(" %s\n", _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as"));
+        printf("   %s\n", _("\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"."));
+        printf(" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} {thresholds b} ...\""));
+
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
+        printf("    %s\n\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
+        printf(" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'");
+        printf("    %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex"));
+        printf("    %s\n\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
+        printf(" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -p /foo -C -w 5% -c 3% -p /bar");
+        printf("    %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
+
+        printf(UT_SUPPORT);
+}
 
-void
-get_stats (struct parameter_list *p, struct fs_usage *fsp) {
-  struct parameter_list *p_list;
-  struct fs_usage tmpfsp;
-  int first = 1;
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s {-w absolute_limit |-w  percentage_limit%% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit%% | -K "
+                   "inode_percentage_limit } {-p path | -x device}\n",
+                   progname);
+        printf("[-C] [-E] [-e] [-f] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n");
+        printf("[-t timeout] [-u unit] [-v] [-X type_regex] [-N type]\n");
+}
 
-  if (p->group == NULL) {
-    get_path_stats(p,fsp);
-  } else {
-    /* find all group members */
-    for (p_list = path_select_list; p_list; p_list=p_list->name_next) {
+bool stat_path(struct parameter_list *p) {
+        /* Stat entry to check that dir exists and is accessible */
+        if (verbose >= 3)
+                printf("calling stat on %s\n", p->name);
+        if (stat(p->name, &stat_buf[0])) {
+                if (verbose >= 3)
+                        printf("stat failed on %s\n", p->name);
+                if (ignore_missing == true) {
+                        return false;
+                }
+                printf("DISK %s - ", _("CRITICAL"));
+                die(STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno));
+        }
+        return true;
+}
+
+void get_stats(struct parameter_list *p, struct fs_usage *fsp) {
+        struct parameter_list *p_list;
+        struct fs_usage tmpfsp;
+        int first = 1;
+
+        if (p->group == NULL) {
+                get_path_stats(p, fsp);
+        } else {
+                /* find all group members */
+                for (p_list = path_select_list; p_list; p_list = p_list->name_next) {
 #ifdef __CYGWIN__
-      if (strncmp(p_list->name, "/cygdrive/", 10) != 0)
-        continue;
+                        if (strncmp(p_list->name, "/cygdrive/", 10) != 0)
+                                continue;
 #endif
-      if (p_list->group && ! (strcmp(p_list->group, p->group))) {
-        if (! stat_path(p_list))
-          continue;
-        get_fs_usage (p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp);
-        get_path_stats(p_list, &tmpfsp);
-        if (verbose >= 3)
-          printf("Group %s: adding %lu blocks sized %lu, (%s) used_units=%lu free_units=%lu total_units=%lu mult=%lu\n",
-                 p_list->group,
-                                 tmpfsp.fsu_blocks,
-                                 tmpfsp.fsu_blocksize,
-                                 p_list->best_match->me_mountdir,
-                                 p_list->dused_units,
-                                 p_list->dfree_units,
-                 p_list->dtotal_units,
-                                 mult);
-
-        /* prevent counting the first FS of a group twice since its parameter_list entry
-         * is used to carry the information of all file systems of the entire group */
-        if (! first) {
-          p->total += p_list->total;
-          p->available += p_list->available;
-          p->available_to_root += p_list->available_to_root;
-          p->used += p_list->used;
-
-          p->dused_units += p_list->dused_units;
-          p->dfree_units += p_list->dfree_units;
-          p->dtotal_units += p_list->dtotal_units;
-          p->inodes_total += p_list->inodes_total;
-          p->inodes_free  += p_list->inodes_free;
-          p->inodes_free_to_root  += p_list->inodes_free_to_root;
-          p->inodes_used  += p_list->inodes_used;
-        }
-        first = 0;
-      }
-      if (verbose >= 3)
-        printf("Group %s now has: used_units=%lu free_units=%lu total_units=%lu fsu_blocksize=%lu mult=%lu\n",
-               p->group,
-               p->dused_units,
-               p->dfree_units,
-               p->dtotal_units,
-               tmpfsp.fsu_blocksize,
-               mult);
-    }
-    /* modify devname and mountdir for output */
-    p->best_match->me_mountdir = p->best_match->me_devname = p->group;
-  }
-  /* finally calculate percentages for either plain FS or summed up group */
-  p->dused_pct = calculate_percent( p->used, p->used + p->available );    /* used + available can never be > uintmax */
-  p->dfree_pct = 100.0 - p->dused_pct;
-  p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total);
-  p->dfree_inodes_percent = 100 - p->dused_inodes_percent;
-
+                        if (p_list->group && !(strcmp(p_list->group, p->group))) {
+                                if (!stat_path(p_list))
+                                        continue;
+                                get_fs_usage(p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp);
+                                get_path_stats(p_list, &tmpfsp);
+                                if (verbose >= 3)
+                                        printf("Group %s: adding %lu blocks sized %lu, (%s) used_units=%lu free_units=%lu total_units=%lu mult=%lu\n",
+                                                   p_list->group, tmpfsp.fsu_blocks, tmpfsp.fsu_blocksize, p_list->best_match->me_mountdir, p_list->dused_units,
+                                                   p_list->dfree_units, p_list->dtotal_units, mult);
+
+                                /* prevent counting the first FS of a group twice since its parameter_list entry
+                                 * is used to carry the information of all file systems of the entire group */
+                                if (!first) {
+                                        p->total += p_list->total;
+                                        p->available += p_list->available;
+                                        p->available_to_root += p_list->available_to_root;
+                                        p->used += p_list->used;
+
+                                        p->dused_units += p_list->dused_units;
+                                        p->dfree_units += p_list->dfree_units;
+                                        p->dtotal_units += p_list->dtotal_units;
+                                        p->inodes_total += p_list->inodes_total;
+                                        p->inodes_free += p_list->inodes_free;
+                                        p->inodes_free_to_root += p_list->inodes_free_to_root;
+                                        p->inodes_used += p_list->inodes_used;
+                                }
+                                first = 0;
+                        }
+                        if (verbose >= 3)
+                                printf("Group %s now has: used_units=%lu free_units=%lu total_units=%lu fsu_blocksize=%lu mult=%lu\n", p->group,
+                                           p->dused_units, p->dfree_units, p->dtotal_units, tmpfsp.fsu_blocksize, mult);
+                }
+                /* modify devname and mountdir for output */
+                p->best_match->me_mountdir = p->best_match->me_devname = p->group;
+        }
+        /* finally calculate percentages for either plain FS or summed up group */
+        p->dused_pct = calculate_percent(p->used, p->used + p->available); /* used + available can never be > uintmax */
+        p->dfree_pct = 100.0 - p->dused_pct;
+        p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total);
+        p->dfree_inodes_percent = 100 - p->dused_inodes_percent;
 }
 
-void
-get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
-  p->available = fsp->fsu_bavail;
-  p->available_to_root = fsp->fsu_bfree;
-  p->used = fsp->fsu_blocks - fsp->fsu_bfree;
-  if (freespace_ignore_reserved) {
-    /* option activated : we subtract the root-reserved space from the total */
-    p->total = fsp->fsu_blocks - p->available_to_root + p->available;
-  } else {
-    /* default behaviour : take all the blocks into account */
-    p->total = fsp->fsu_blocks;
-  }
-
-  p->dused_units = p->used*fsp->fsu_blocksize/mult;
-  p->dfree_units = p->available*fsp->fsu_blocksize/mult;
-  p->dtotal_units = p->total*fsp->fsu_blocksize/mult;
-  /* Free file nodes. Not sure the workaround is required, but in case...*/
-  p->inodes_free  = fsp->fsu_ffree;
-  p->inodes_free_to_root  = fsp->fsu_ffree; /* Free file nodes for root. */
-  p->inodes_used = fsp->fsu_files - fsp->fsu_ffree;
-  if (freespace_ignore_reserved) {
-    /* option activated : we subtract the root-reserved inodes from the total */
-    /* not all OS report fsp->fsu_favail, only the ones with statvfs syscall */
-    /* for others, fsp->fsu_ffree == fsp->fsu_favail */
-    p->inodes_total = fsp->fsu_files - p->inodes_free_to_root + p->inodes_free;
-  } else {
-    /* default behaviour : take all the inodes into account */
-    p->inodes_total = fsp->fsu_files;
-  }
-  np_add_name(&seen, p->best_match->me_mountdir);
+void get_path_stats(struct parameter_list *p, struct fs_usage *fsp) {
+        p->available = fsp->fsu_bavail;
+        p->available_to_root = fsp->fsu_bfree;
+        p->used = fsp->fsu_blocks - fsp->fsu_bfree;
+        if (freespace_ignore_reserved) {
+                /* option activated : we subtract the root-reserved space from the total */
+                p->total = fsp->fsu_blocks - p->available_to_root + p->available;
+        } else {
+                /* default behaviour : take all the blocks into account */
+                p->total = fsp->fsu_blocks;
+        }
+
+        p->dused_units = p->used * fsp->fsu_blocksize / mult;
+        p->dfree_units = p->available * fsp->fsu_blocksize / mult;
+        p->dtotal_units = p->total * fsp->fsu_blocksize / mult;
+        /* Free file nodes. Not sure the workaround is required, but in case...*/
+        p->inodes_free = fsp->fsu_ffree;
+        p->inodes_free_to_root = fsp->fsu_ffree; /* Free file nodes for root. */
+        p->inodes_used = fsp->fsu_files - fsp->fsu_ffree;
+        if (freespace_ignore_reserved) {
+                /* option activated : we subtract the root-reserved inodes from the total */
+                /* not all OS report fsp->fsu_favail, only the ones with statvfs syscall */
+                /* for others, fsp->fsu_ffree == fsp->fsu_favail */
+                p->inodes_total = fsp->fsu_files - p->inodes_free_to_root + p->inodes_free;
+        } else {
+                /* default behaviour : take all the inodes into account */
+                p->inodes_total = fsp->fsu_files;
+        }
+        np_add_name(&seen, p->best_match->me_mountdir);
 }
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 468bc95..e1e7c00 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_dns plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dns plugin
-* 
-* LIMITATION: nslookup on Solaris 7 can return output over 2 lines, which
-* will not be picked up by this plugin
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_dns plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dns plugin
+ *
+ * LIMITATION: nslookup on Solaris 7 can return output over 2 lines, which
+ * will not be picked up by this plugin
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_dns";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -39,579 +39,534 @@ const char *email = "devel@monitoring-plugins.org";
 #include "netutils.h"
 #include "runcmd.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-int error_scan (char *, bool *);
-bool ip_match_cidr(const char *, const char *);
-unsigned long ip2long(const char *);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static int error_scan(char * /*input_buffer*/, bool *);
+static bool ip_match_cidr(const char * /*addr*/, const char * /*cidr_ro*/);
+static unsigned long ip2long(const char * /*src*/);
+static void print_help(void);
+void print_usage(void);
 
 #define ADDRESS_LENGTH 256
-char query_address[ADDRESS_LENGTH] = "";
-char dns_server[ADDRESS_LENGTH] = "";
-char ptr_server[ADDRESS_LENGTH] = "";
-bool verbose = false;
-char **expected_address = NULL;
-int expected_address_cnt = 0;
-bool expect_nxdomain = false;
-
-bool expect_authority = false;
-bool all_match = false;
-thresholds *time_thresholds = NULL;
-
-static int
-qstrcmp(const void *p1, const void *p2)
-{
+static char query_address[ADDRESS_LENGTH] = "";
+static char dns_server[ADDRESS_LENGTH] = "";
+static char ptr_server[ADDRESS_LENGTH] = "";
+static bool verbose = false;
+static char **expected_address = NULL;
+static int expected_address_cnt = 0;
+static bool expect_nxdomain = false;
+
+static bool expect_authority = false;
+static bool all_match = false;
+static thresholds *time_thresholds = NULL;
+
+static int qstrcmp(const void *p1, const void *p2) {
         /* The actual arguments to this function are "pointers to
            pointers to char", but strcmp() arguments are "pointers
            to char", hence the following cast plus dereference */
-        return strcmp(* (char * const *) p1, * (char * const *) p2);
+        return strcmp(*(char *const *)p1, *(char *const *)p2);
 }
 
+int main(int argc, char **argv) {
+        char *command_line = NULL;
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *address = NULL; /* comma separated str with addrs/ptrs (sorted) */
+        char **addresses = NULL;
+        int n_addresses = 0;
+        char *msg = NULL;
+        char *temp_buffer = NULL;
+        bool non_authoritative = false;
+        int result = STATE_UNKNOWN;
+        double elapsed_time;
+        long microsec;
+        struct timeval tv;
+        bool parse_address = false; /* This flag scans for Address: but only after Name: */
+        output chld_out;
+        output chld_err;
+        bool is_nxdomain = false;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Set signal handling and alarm */
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
+                usage_va(_("Cannot catch SIGALRM"));
+        }
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        if (process_arguments(argc, argv) == ERROR) {
+                usage_va(_("Could not parse arguments"));
+        }
+
+        /* get the command to run */
+        xasprintf(&command_line, "%s %s %s", NSLOOKUP_COMMAND, query_address, dns_server);
+
+        alarm(timeout_interval);
+        gettimeofday(&tv, NULL);
+
+        if (verbose)
+                printf("%s\n", command_line);
+
+        /* run the command */
+        if ((np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0) {
+                msg = (char *)_("nslookup returned an error status");
+                result = STATE_WARNING;
+        }
+
+        /* scan stdout */
+        for (size_t i = 0; i < chld_out.lines; i++) {
+                if (addresses == NULL)
+                        addresses = malloc(sizeof(*addresses) * 10);
+                else if (!(n_addresses % 10))
+                        addresses = realloc(addresses, sizeof(*addresses) * (n_addresses + 10));
+
+                if (verbose)
+                        puts(chld_out.line[i]);
+
+                if (strcasestr(chld_out.line[i], ".in-addr.arpa") || strcasestr(chld_out.line[i], ".ip6.arpa")) {
+                        if ((temp_buffer = strstr(chld_out.line[i], "name = ")))
+                                addresses[n_addresses++] = strdup(temp_buffer + 7);
+                        else {
+                                msg = (char *)_("Warning plugin error");
+                                result = STATE_WARNING;
+                        }
+                }
+
+                /* bug ID: 2946553 - Older versions of bind will use all available dns
+                                                         servers, we have to match the one specified */
+                if (strstr(chld_out.line[i], "Server:") && strlen(dns_server) > 0) {
+                        temp_buffer = strchr(chld_out.line[i], ':');
+                        temp_buffer++;
+
+                        /* Strip leading tabs */
+                        for (; *temp_buffer != '\0' && *temp_buffer == '\t'; temp_buffer++)
+                                /* NOOP */;
+
+                        strip(temp_buffer);
+                        if (temp_buffer == NULL || strlen(temp_buffer) == 0) {
+                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty server string\n"), NSLOOKUP_COMMAND);
+                        }
+
+                        if (strcmp(temp_buffer, dns_server) != 0) {
+                                die(STATE_CRITICAL, _("DNS CRITICAL - No response from DNS %s\n"), dns_server);
+                        }
+                }
+
+                /* the server is responding, we just got the host name... */
+                if (strstr(chld_out.line[i], "Name:"))
+                        parse_address = true;
+                else if (parse_address && (strstr(chld_out.line[i], "Address:") || strstr(chld_out.line[i], "Addresses:"))) {
+                        temp_buffer = index(chld_out.line[i], ':');
+                        temp_buffer++;
+
+                        /* Strip leading spaces */
+                        while (*temp_buffer == ' ')
+                                temp_buffer++;
+
+                        strip(temp_buffer);
+                        if (temp_buffer == NULL || strlen(temp_buffer) == 0) {
+                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty host name string\n"), NSLOOKUP_COMMAND);
+                        }
+
+                        addresses[n_addresses++] = strdup(temp_buffer);
+                } else if (strstr(chld_out.line[i], _("Non-authoritative answer:"))) {
+                        non_authoritative = true;
+                }
+
+                result = error_scan(chld_out.line[i], &is_nxdomain);
+                if (result != STATE_OK) {
+                        msg = strchr(chld_out.line[i], ':');
+                        if (msg)
+                                msg++;
+                        break;
+                }
+        }
+
+        /* scan stderr */
+        for (size_t i = 0; i < chld_err.lines; i++) {
+                if (verbose)
+                        puts(chld_err.line[i]);
+
+                if (error_scan(chld_err.line[i], &is_nxdomain) != STATE_OK) {
+                        result = max_state(result, error_scan(chld_err.line[i], &is_nxdomain));
+                        msg = strchr(input_buffer, ':');
+                        if (msg)
+                                msg++;
+                        else
+                                msg = input_buffer;
+                }
+        }
+
+        if (is_nxdomain && !expect_nxdomain) {
+                die(STATE_CRITICAL, _("Domain '%s' was not found by the server\n"), query_address);
+        }
 
-int
-main (int argc, char **argv)
-{
-  char *command_line = NULL;
-  char input_buffer[MAX_INPUT_BUFFER];
-  char *address = NULL; /* comma separated str with addrs/ptrs (sorted) */
-  char **addresses = NULL;
-  int n_addresses = 0;
-  char *msg = NULL;
-  char *temp_buffer = NULL;
-  bool non_authoritative = false;
-  int result = STATE_UNKNOWN;
-  double elapsed_time;
-  long microsec;
-  struct timeval tv;
-  bool parse_address = false; /* This flag scans for Address: but only after Name: */
-  output chld_out, chld_err;
-  bool is_nxdomain = false;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Set signal handling and alarm */
-  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
-    usage_va(_("Cannot catch SIGALRM"));
-  }
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR) {
-    usage_va(_("Could not parse arguments"));
-  }
-
-  /* get the command to run */
-  xasprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND, query_address, dns_server);
-
-  alarm (timeout_interval);
-  gettimeofday (&tv, NULL);
-
-  if (verbose)
-    printf ("%s\n", command_line);
-
-  /* run the command */
-  if((np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0) {
-    msg = (char *)_("nslookup returned an error status");
-    result = STATE_WARNING;
-  }
-
-  /* scan stdout */
-  for(size_t i = 0; i < chld_out.lines; i++) {
-    if (addresses == NULL)
-      addresses = malloc(sizeof(*addresses)*10);
-    else if (!(n_addresses % 10))
-      addresses = realloc(addresses,sizeof(*addresses) * (n_addresses + 10));
-
-    if (verbose)
-      puts(chld_out.line[i]);
-
-    if (strcasestr (chld_out.line[i], ".in-addr.arpa") || strcasestr (chld_out.line[i], ".ip6.arpa")) {
-      if ((temp_buffer = strstr (chld_out.line[i], "name = ")))
-        addresses[n_addresses++] = strdup (temp_buffer + 7);
-      else {
-        msg = (char *)_("Warning plugin error");
-        result = STATE_WARNING;
-      }
-    }
-
-    /* bug ID: 2946553 - Older versions of bind will use all available dns 
-                         servers, we have to match the one specified */
-    if (strstr (chld_out.line[i], "Server:") && strlen(dns_server) > 0) {
-      temp_buffer = strchr (chld_out.line[i], ':');
-      temp_buffer++;
-
-      /* Strip leading tabs */
-      for (; *temp_buffer != '\0' && *temp_buffer == '\t'; temp_buffer++)
-        /* NOOP */;
-
-      strip(temp_buffer);
-      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
-        die (STATE_CRITICAL,
-             _("DNS CRITICAL - '%s' returned empty server string\n"),
-             NSLOOKUP_COMMAND);
-      }
-
-      if (strcmp(temp_buffer, dns_server) != 0) {
-        die (STATE_CRITICAL, _("DNS CRITICAL - No response from DNS %s\n"), dns_server);
-      }
-    }
-
-    /* the server is responding, we just got the host name... */
-    if (strstr (chld_out.line[i], "Name:"))
-      parse_address = true;
-    else if (parse_address && (strstr (chld_out.line[i], "Address:") ||
-             strstr (chld_out.line[i], "Addresses:"))) {
-      temp_buffer = index (chld_out.line[i], ':');
-      temp_buffer++;
-
-      /* Strip leading spaces */
-      while (*temp_buffer == ' ')
-        temp_buffer++;
-
-      strip(temp_buffer);
-      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
-        die (STATE_CRITICAL,
-             _("DNS CRITICAL - '%s' returned empty host name string\n"),
-             NSLOOKUP_COMMAND);
-      }
-
-      addresses[n_addresses++] = strdup(temp_buffer);
-    }
-    else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
-      non_authoritative = true;
-    }
-
-
-    result = error_scan (chld_out.line[i], &is_nxdomain);
-    if (result != STATE_OK) {
-      msg = strchr (chld_out.line[i], ':');
-      if(msg) msg++;
-      break;
-    }
-  }
-
-  /* scan stderr */
-  for(size_t i = 0; i < chld_err.lines; i++) {
-    if (verbose)
-      puts(chld_err.line[i]);
-
-    if (error_scan (chld_err.line[i], &is_nxdomain) != STATE_OK) {
-      result = max_state (result, error_scan (chld_err.line[i], &is_nxdomain));
-      msg = strchr(input_buffer, ':');
-      if(msg)
-         msg++;
-      else
-         msg = input_buffer;
-    }
-  }
-
-  if (is_nxdomain && !expect_nxdomain) {
-    die (STATE_CRITICAL, _("Domain '%s' was not found by the server\n"), query_address);
-  }
-
-  if (addresses) {
-    int i,slen;
-    char *adrp;
-    qsort(addresses, n_addresses, sizeof(*addresses), qstrcmp);
-    for(i=0, slen=1; i < n_addresses; i++) {
-      slen += strlen(addresses[i])+1;
-    }
-    adrp = address = malloc(slen);
-    for(i=0; i < n_addresses; i++) {
-      if (i) *adrp++ = ',';
-      strcpy(adrp, addresses[i]);
-      adrp += strlen(addresses[i]);
-    }
-    *adrp = 0;
-  } else
-    die (STATE_CRITICAL,
-         _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
-         NSLOOKUP_COMMAND);
-
-  /* compare to expected address */
-  if (result == STATE_OK && expected_address_cnt > 0) {
-    result = STATE_CRITICAL;
-    temp_buffer = "";
-    unsigned long expect_match = (1 << expected_address_cnt) - 1;
-    unsigned long addr_match = (1 << n_addresses) - 1;
-
-    for (int i=0; i<expected_address_cnt; i++) {
-      int j;
-      /* check if we get a match on 'raw' ip or cidr */
-      for (j=0; j<n_addresses; j++) {
-        if ( strcmp(addresses[j], expected_address[i]) == 0
-             || ip_match_cidr(addresses[j], expected_address[i]) ) {
-          result = STATE_OK;
-          addr_match &= ~(1 << j);
-          expect_match &= ~(1 << i);
-        }
-      }
-
-      /* prepare an error string */
-      xasprintf(&temp_buffer, "%s%s; ", temp_buffer, expected_address[i]);
-    }
-    /* check if expected_address must cover all in addresses and none may be missing */
-    if (all_match && (expect_match != 0 || addr_match != 0))
-      result = STATE_CRITICAL;
-    if (result == STATE_CRITICAL) {
-      /* Strip off last semicolon... */
-      temp_buffer[strlen(temp_buffer)-2] = '\0';
-      xasprintf(&msg, _("expected '%s' but got '%s'"), temp_buffer, address);
-    }
-  }
-
-  if (expect_nxdomain) {
-    if (!is_nxdomain) {
-      result = STATE_CRITICAL;
-      xasprintf(&msg, _("Domain '%s' was found by the server: '%s'\n"), query_address, address);
-    } else {
-      if (address != NULL) free(address);
-      address = "NXDOMAIN";
-    }
-  }
-
-  /* check if authoritative */
-  if (result == STATE_OK && expect_authority && non_authoritative) {
-    result = STATE_CRITICAL;
-    xasprintf(&msg, _("server %s is not authoritative for %s"), dns_server, query_address);
-  }
-
-  microsec = deltime (tv);
-  elapsed_time = (double)microsec / 1.0e6;
-
-  if (result == STATE_OK) {
-    result = get_status(elapsed_time, time_thresholds);
-    if (result == STATE_OK) {
-      printf ("DNS %s: ", _("OK"));
-    } else if (result == STATE_WARNING) {
-      printf ("DNS %s: ", _("WARNING"));
-    } else if (result == STATE_CRITICAL) {
-      printf ("DNS %s: ", _("CRITICAL"));
-    }
-    printf (ngettext("%.3f second response time", "%.3f seconds response time", elapsed_time), elapsed_time);
-    printf (_(". %s returns %s"), query_address, address);
-    if ((time_thresholds->warning != NULL) && (time_thresholds->critical != NULL)) {
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  true, time_thresholds->warning->end,
-                                  true, time_thresholds->critical->end,
-                                  true, 0, false, 0));
-    } else if ((time_thresholds->warning == NULL) && (time_thresholds->critical != NULL)) {
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  false, 0,
-                                  true, time_thresholds->critical->end,
-                                  true, 0, false, 0));
-    } else if ((time_thresholds->warning != NULL) && (time_thresholds->critical == NULL)) {
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  true, time_thresholds->warning->end,
-                                  false, 0,
-                                  true, 0, false, 0));
-    } else
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s", false, 0, false, 0, true, 0, false, 0));
-  }
-  else if (result == STATE_WARNING)
-    printf (_("DNS WARNING - %s\n"),
-            !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
-  else if (result == STATE_CRITICAL)
-    printf (_("DNS CRITICAL - %s\n"),
-            !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
-  else
-    printf (_("DNS UNKNOWN - %s\n"),
-            !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
-
-  return result;
+        if (addresses) {
+                int i;
+                int slen;
+                char *adrp;
+                qsort(addresses, n_addresses, sizeof(*addresses), qstrcmp);
+                for (i = 0, slen = 1; i < n_addresses; i++) {
+                        slen += strlen(addresses[i]) + 1;
+                }
+                adrp = address = malloc(slen);
+                for (i = 0; i < n_addresses; i++) {
+                        if (i)
+                                *adrp++ = ',';
+                        strcpy(adrp, addresses[i]);
+                        adrp += strlen(addresses[i]);
+                }
+                *adrp = 0;
+        } else
+                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' msg parsing exited with no address\n"), NSLOOKUP_COMMAND);
+
+        /* compare to expected address */
+        if (result == STATE_OK && expected_address_cnt > 0) {
+                result = STATE_CRITICAL;
+                temp_buffer = "";
+                unsigned long expect_match = (1 << expected_address_cnt) - 1;
+                unsigned long addr_match = (1 << n_addresses) - 1;
+
+                for (int i = 0; i < expected_address_cnt; i++) {
+                        int j;
+                        /* check if we get a match on 'raw' ip or cidr */
+                        for (j = 0; j < n_addresses; j++) {
+                                if (strcmp(addresses[j], expected_address[i]) == 0 || ip_match_cidr(addresses[j], expected_address[i])) {
+                                        result = STATE_OK;
+                                        addr_match &= ~(1 << j);
+                                        expect_match &= ~(1 << i);
+                                }
+                        }
+
+                        /* prepare an error string */
+                        xasprintf(&temp_buffer, "%s%s; ", temp_buffer, expected_address[i]);
+                }
+                /* check if expected_address must cover all in addresses and none may be missing */
+                if (all_match && (expect_match != 0 || addr_match != 0))
+                        result = STATE_CRITICAL;
+                if (result == STATE_CRITICAL) {
+                        /* Strip off last semicolon... */
+                        temp_buffer[strlen(temp_buffer) - 2] = '\0';
+                        xasprintf(&msg, _("expected '%s' but got '%s'"), temp_buffer, address);
+                }
+        }
+
+        if (expect_nxdomain) {
+                if (!is_nxdomain) {
+                        result = STATE_CRITICAL;
+                        xasprintf(&msg, _("Domain '%s' was found by the server: '%s'\n"), query_address, address);
+                } else {
+                        if (address != NULL)
+                                free(address);
+                        address = "NXDOMAIN";
+                }
+        }
+
+        /* check if authoritative */
+        if (result == STATE_OK && expect_authority && non_authoritative) {
+                result = STATE_CRITICAL;
+                xasprintf(&msg, _("server %s is not authoritative for %s"), dns_server, query_address);
+        }
+
+        microsec = deltime(tv);
+        elapsed_time = (double)microsec / 1.0e6;
+
+        if (result == STATE_OK) {
+                result = get_status(elapsed_time, time_thresholds);
+                if (result == STATE_OK) {
+                        printf("DNS %s: ", _("OK"));
+                } else if (result == STATE_WARNING) {
+                        printf("DNS %s: ", _("WARNING"));
+                } else if (result == STATE_CRITICAL) {
+                        printf("DNS %s: ", _("CRITICAL"));
+                }
+                printf(ngettext("%.3f second response time", "%.3f seconds response time", elapsed_time), elapsed_time);
+                printf(_(". %s returns %s"), query_address, address);
+                if ((time_thresholds->warning != NULL) && (time_thresholds->critical != NULL)) {
+                        printf("|%s\n", fperfdata("time", elapsed_time, "s", true, time_thresholds->warning->end, true, time_thresholds->critical->end,
+                                                                          true, 0, false, 0));
+                } else if ((time_thresholds->warning == NULL) && (time_thresholds->critical != NULL)) {
+                        printf("|%s\n", fperfdata("time", elapsed_time, "s", false, 0, true, time_thresholds->critical->end, true, 0, false, 0));
+                } else if ((time_thresholds->warning != NULL) && (time_thresholds->critical == NULL)) {
+                        printf("|%s\n", fperfdata("time", elapsed_time, "s", true, time_thresholds->warning->end, false, 0, true, 0, false, 0));
+                } else
+                        printf("|%s\n", fperfdata("time", elapsed_time, "s", false, 0, false, 0, true, 0, false, 0));
+        } else if (result == STATE_WARNING)
+                printf(_("DNS WARNING - %s\n"), !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
+        else if (result == STATE_CRITICAL)
+                printf(_("DNS CRITICAL - %s\n"), !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
+        else
+                printf(_("DNS UNKNOWN - %s\n"), !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
+
+        return result;
 }
 
 bool ip_match_cidr(const char *addr, const char *cidr_ro) {
-  char *subnet, *mask_c, *cidr = strdup(cidr_ro);
-  int mask;
-  subnet = strtok(cidr, "/");
-  mask_c = strtok(NULL, "\0");
-  if (!subnet || !mask_c) {
-    return false;
+        char *subnet;
+        char *mask_c;
+        char *cidr = strdup(cidr_ro);
+        int mask;
+        subnet = strtok(cidr, "/");
+        mask_c = strtok(NULL, "\0");
+        if (!subnet || !mask_c) {
+                return false;
         }
-  mask = atoi(mask_c);
+        mask = atoi(mask_c);
 
-  /* https://www.cryptobells.com/verifying-ips-in-a-subnet-in-php/ */
-  return (ip2long(addr) & ~((1 << (32 - mask)) - 1)) == (ip2long(subnet) >> (32 - mask)) << (32 - mask);
+        /* https://www.cryptobells.com/verifying-ips-in-a-subnet-in-php/ */
+        return (ip2long(addr) & ~((1 << (32 - mask)) - 1)) == (ip2long(subnet) >> (32 - mask)) << (32 - mask);
 }
 
-unsigned long
-ip2long(const char* src) {
-  unsigned long ip[4];
-  /* http://computer-programming-forum.com/47-c-language/1376ffb92a12c471.htm */
-  return (sscanf(src, "%3lu.%3lu.%3lu.%3lu",
-                     &ip[0], &ip[1], &ip[2], &ip[3]) == 4 &&
-              ip[0] < 256 && ip[1] < 256 &&
-              ip[2] < 256 && ip[3] < 256)
-          ? ip[0] << 24 | ip[1] << 16 | ip[2] << 8 | ip[3]
-          : 0; 
+unsigned long ip2long(const char *src) {
+        unsigned long ip[4];
+        /* http://computer-programming-forum.com/47-c-language/1376ffb92a12c471.htm */
+        return (sscanf(src, "%3lu.%3lu.%3lu.%3lu", &ip[0], &ip[1], &ip[2], &ip[3]) == 4 && ip[0] < 256 && ip[1] < 256 && ip[2] < 256 &&
+                        ip[3] < 256)
+                           ? ip[0] << 24 | ip[1] << 16 | ip[2] << 8 | ip[3]
+                           : 0;
 }
 
-int
-error_scan (char *input_buffer, bool *is_nxdomain)
-{
-
-  const int nxdomain = strstr (input_buffer, "Non-existent") ||
-                       strstr (input_buffer, "** server can't find") ||
-                       strstr (input_buffer, "** Can't find") ||
-                       strstr (input_buffer, "NXDOMAIN");
-  if (nxdomain) *is_nxdomain = true;
-
-  /* the DNS lookup timed out */
-  if (strstr (input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) ||
-      strstr (input_buffer, _("Consider using the `dig' or `host' programs instead.  Run nslookup with")) ||
-      strstr (input_buffer, _("the `-sil[ent]' option to prevent this message from appearing.")))
-    return STATE_OK;
-
-  /* DNS server is not running... */
-  else if (strstr (input_buffer, "No response from server"))
-    die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
-  else if (strstr (input_buffer, "no servers could be reached"))
-    die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
-
-  /* Host name is valid, but server doesn't have records... */
-  else if (strstr (input_buffer, "No records"))
-    die (STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
-
-  /* Connection was refused */
-  else if (strstr (input_buffer, "Connection refused") ||
-           strstr (input_buffer, "Couldn't find server") ||
-           strstr (input_buffer, "Refused") ||
-           (strstr (input_buffer, "** server can't find") &&
-            strstr (input_buffer, ": REFUSED")))
-    die (STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
-
-  /* Query refused (usually by an ACL in the namserver) */
-  else if (strstr (input_buffer, "Query refused"))
-    die (STATE_CRITICAL, _("Query was refused by DNS server at %s\n"), dns_server);
-
-  /* No information (e.g. nameserver IP has two PTR records) */
-  else if (strstr (input_buffer, "No information"))
-    die (STATE_CRITICAL, _("No information returned by DNS server at %s\n"), dns_server);
-
-  /* Network is unreachable */
-  else if (strstr (input_buffer, "Network is unreachable"))
-    die (STATE_CRITICAL, _("Network is unreachable\n"));
-
-  /* Internal server failure */
-  else if (strstr (input_buffer, "Server failure"))
-    die (STATE_CRITICAL, _("DNS failure for %s\n"), dns_server);
-
-  /* Request error or the DNS lookup timed out */
-  else if (strstr (input_buffer, "Format error") ||
-           strstr (input_buffer, "Timed out"))
-    return STATE_WARNING;
-
-  return STATE_OK;
+int error_scan(char *input_buffer, bool *is_nxdomain) {
 
-}
+        const int nxdomain = strstr(input_buffer, "Non-existent") || strstr(input_buffer, "** server can't find") ||
+                                                 strstr(input_buffer, "** Can't find") || strstr(input_buffer, "NXDOMAIN");
+        if (nxdomain)
+                *is_nxdomain = true;
+
+        /* the DNS lookup timed out */
+        if (strstr(input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) ||
+                strstr(input_buffer, _("Consider using the `dig' or `host' programs instead.  Run nslookup with")) ||
+                strstr(input_buffer, _("the `-sil[ent]' option to prevent this message from appearing.")))
+                return STATE_OK;
+
+        /* DNS server is not running... */
+        else if (strstr(input_buffer, "No response from server"))
+                die(STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
+        else if (strstr(input_buffer, "no servers could be reached"))
+                die(STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
+
+        /* Host name is valid, but server doesn't have records... */
+        else if (strstr(input_buffer, "No records"))
+                die(STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
+
+        /* Connection was refused */
+        else if (strstr(input_buffer, "Connection refused") || strstr(input_buffer, "Couldn't find server") ||
+                         strstr(input_buffer, "Refused") || (strstr(input_buffer, "** server can't find") && strstr(input_buffer, ": REFUSED")))
+                die(STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
+
+        /* Query refused (usually by an ACL in the namserver) */
+        else if (strstr(input_buffer, "Query refused"))
+                die(STATE_CRITICAL, _("Query was refused by DNS server at %s\n"), dns_server);
+
+        /* No information (e.g. nameserver IP has two PTR records) */
+        else if (strstr(input_buffer, "No information"))
+                die(STATE_CRITICAL, _("No information returned by DNS server at %s\n"), dns_server);
+
+        /* Network is unreachable */
+        else if (strstr(input_buffer, "Network is unreachable"))
+                die(STATE_CRITICAL, _("Network is unreachable\n"));
+
+        /* Internal server failure */
+        else if (strstr(input_buffer, "Server failure"))
+                die(STATE_CRITICAL, _("DNS failure for %s\n"), dns_server);
 
+        /* Request error or the DNS lookup timed out */
+        else if (strstr(input_buffer, "Format error") || strstr(input_buffer, "Timed out"))
+                return STATE_WARNING;
+
+        return STATE_OK;
+}
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-  char *warning = NULL;
-  char *critical = NULL;
-
-  int opt_index = 0;
-  static struct option long_opts[] = {
-    {"help", no_argument, 0, 'h'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    {"timeout", required_argument, 0, 't'},
-    {"hostname", required_argument, 0, 'H'},
-    {"server", required_argument, 0, 's'},
-    {"reverse-server", required_argument, 0, 'r'},
-    {"expected-address", required_argument, 0, 'a'},
-    {"expect-nxdomain",  no_argument, 0, 'n'},
-    {"expect-authority", no_argument, 0, 'A'},
-    {"all", no_argument, 0, 'L'},
-    {"warning", required_argument, 0, 'w'},
-    {"critical", required_argument, 0, 'c'},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  for (c = 1; c < argc; c++)
-    if (strcmp ("-to", argv[c]) == 0)
-      strcpy (argv[c], "-t");
-
-  while (1) {
-    c = getopt_long (argc, argv, "hVvALnt:H:s:r:a:w:c:", long_opts, &opt_index);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 'h': /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V': /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'v': /* version */
-      verbose = true;
-      break;
-    case 't': /* timeout period */
-      timeout_interval = atoi (optarg);
-      break;
-    case 'H': /* hostname */
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      strcpy (query_address, optarg);
-      break;
-    case 's': /* server name */
-      /* TODO: this host_or_die check is probably unnecessary.
-       * Better to confirm nslookup response matches */
-      host_or_die(optarg);
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      strcpy (dns_server, optarg);
-      break;
-    case 'r': /* reverse server name */
-      /* TODO: Is this host_or_die necessary? */
-      host_or_die(optarg);
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      strcpy (ptr_server, optarg);
-      break;
-    case 'a': /* expected address */
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      if (strchr(optarg, ',') != NULL) {
-        char *comma = strchr(optarg, ',');
-        while (comma != NULL) {
-          expected_address = (char **)realloc(expected_address, (expected_address_cnt+1) * sizeof(char**));
-          expected_address[expected_address_cnt] = strndup(optarg, comma - optarg);
-          expected_address_cnt++;
-          optarg = comma + 1;
-          comma = strchr(optarg, ',');
+int process_arguments(int argc, char **argv) {
+        int c;
+        char *warning = NULL;
+        char *critical = NULL;
+
+        int opt_index = 0;
+        static struct option long_opts[] = {{"help", no_argument, 0, 'h'},
+                                                                                {"version", no_argument, 0, 'V'},
+                                                                                {"verbose", no_argument, 0, 'v'},
+                                                                                {"timeout", required_argument, 0, 't'},
+                                                                                {"hostname", required_argument, 0, 'H'},
+                                                                                {"server", required_argument, 0, 's'},
+                                                                                {"reverse-server", required_argument, 0, 'r'},
+                                                                                {"expected-address", required_argument, 0, 'a'},
+                                                                                {"expect-nxdomain", no_argument, 0, 'n'},
+                                                                                {"expect-authority", no_argument, 0, 'A'},
+                                                                                {"all", no_argument, 0, 'L'},
+                                                                                {"warning", required_argument, 0, 'w'},
+                                                                                {"critical", required_argument, 0, 'c'},
+                                                                                {0, 0, 0, 0}};
+
+        if (argc < 2)
+                return ERROR;
+
+        for (c = 1; c < argc; c++)
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+
+        while (1) {
+                c = getopt_long(argc, argv, "hVvALnt:H:s:r:a:w:c:", long_opts, &opt_index);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* version */
+                        verbose = true;
+                        break;
+                case 't': /* timeout period */
+                        timeout_interval = atoi(optarg);
+                        break;
+                case 'H': /* hostname */
+                        if (strlen(optarg) >= ADDRESS_LENGTH)
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        strcpy(query_address, optarg);
+                        break;
+                case 's': /* server name */
+                        /* TODO: this host_or_die check is probably unnecessary.
+                         * Better to confirm nslookup response matches */
+                        host_or_die(optarg);
+                        if (strlen(optarg) >= ADDRESS_LENGTH)
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        strcpy(dns_server, optarg);
+                        break;
+                case 'r': /* reverse server name */
+                        /* TODO: Is this host_or_die necessary? */
+                        host_or_die(optarg);
+                        if (strlen(optarg) >= ADDRESS_LENGTH)
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        strcpy(ptr_server, optarg);
+                        break;
+                case 'a': /* expected address */
+                        if (strlen(optarg) >= ADDRESS_LENGTH)
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        if (strchr(optarg, ',') != NULL) {
+                                char *comma = strchr(optarg, ',');
+                                while (comma != NULL) {
+                                        expected_address = (char **)realloc(expected_address, (expected_address_cnt + 1) * sizeof(char **));
+                                        expected_address[expected_address_cnt] = strndup(optarg, comma - optarg);
+                                        expected_address_cnt++;
+                                        optarg = comma + 1;
+                                        comma = strchr(optarg, ',');
+                                }
+                                expected_address = (char **)realloc(expected_address, (expected_address_cnt + 1) * sizeof(char **));
+                                expected_address[expected_address_cnt] = strdup(optarg);
+                                expected_address_cnt++;
+                        } else {
+                                expected_address = (char **)realloc(expected_address, (expected_address_cnt + 1) * sizeof(char **));
+                                expected_address[expected_address_cnt] = strdup(optarg);
+                                expected_address_cnt++;
+                        }
+                        break;
+                case 'n': /* expect NXDOMAIN */
+                        expect_nxdomain = true;
+                        break;
+                case 'A': /* expect authority */
+                        expect_authority = true;
+                        break;
+                case 'L': /* all must match */
+                        all_match = true;
+                        break;
+                case 'w':
+                        warning = optarg;
+                        break;
+                case 'c':
+                        critical = optarg;
+                        break;
+                default: /* args not parsable */
+                        usage5();
+                }
         }
-        expected_address = (char **)realloc(expected_address, (expected_address_cnt+1) * sizeof(char**));
-        expected_address[expected_address_cnt] = strdup(optarg);
-        expected_address_cnt++;
-      } else {
-        expected_address = (char **)realloc(expected_address, (expected_address_cnt+1) * sizeof(char**));
-        expected_address[expected_address_cnt] = strdup(optarg);
-        expected_address_cnt++;
-      }
-      break;
-    case 'n': /* expect NXDOMAIN */
-      expect_nxdomain = true;
-      break;
-    case 'A': /* expect authority */
-      expect_authority = true;
-      break;
-    case 'L': /* all must match */
-      all_match = true;
-      break;
-    case 'w':
-      warning = optarg;
-      break;
-    case 'c':
-      critical = optarg;
-      break;
-    default: /* args not parsable */
-      usage5();
-    }
-  }
-
-  c = optind;
-  if (strlen(query_address)==0 && c<argc) {
-    if (strlen(argv[c])>=ADDRESS_LENGTH)
-      die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-    strcpy (query_address, argv[c++]);
-  }
-
-  if (strlen(dns_server)==0 && c<argc) {
-    /* TODO: See -s option */
-    host_or_die(argv[c]);
-    if (strlen(argv[c]) >= ADDRESS_LENGTH)
-      die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-    strcpy (dns_server, argv[c++]);
-  }
-
-  set_thresholds(&time_thresholds, warning, critical);
-
-  return validate_arguments ();
-}
 
+        c = optind;
+        if (strlen(query_address) == 0 && c < argc) {
+                if (strlen(argv[c]) >= ADDRESS_LENGTH)
+                        die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                strcpy(query_address, argv[c++]);
+        }
 
-int
-validate_arguments ()
-{
-  if (query_address[0] == 0) {
-    printf ("missing --host argument\n");
-    return ERROR;
-  }
+        if (strlen(dns_server) == 0 && c < argc) {
+                /* TODO: See -s option */
+                host_or_die(argv[c]);
+                if (strlen(argv[c]) >= ADDRESS_LENGTH)
+                        die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                strcpy(dns_server, argv[c++]);
+        }
 
-  if (expected_address_cnt > 0 && expect_nxdomain) {
-    printf ("--expected-address and --expect-nxdomain cannot be combined\n");
-    return ERROR;
-  }
+        set_thresholds(&time_thresholds, warning, critical);
 
-  return OK;
+        return validate_arguments();
 }
 
+int validate_arguments(void) {
+        if (query_address[0] == 0) {
+                printf("missing --host argument\n");
+                return ERROR;
+        }
+
+        if (expected_address_cnt > 0 && expect_nxdomain) {
+                printf("--expected-address and --expect-nxdomain cannot be combined\n");
+                return ERROR;
+        }
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
-
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
-
-  printf ("%s\n", _("This plugin uses the nslookup program to obtain the IP address for the given host/domain query."));
-  printf ("%s\n", _("An optional DNS server to use may be specified."));
-  printf ("%s\n", _("If no DNS server is specified, the default server(s) specified in /etc/resolv.conf will be used."));
-
-  printf ("\n\n");
-
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
-
-  printf (" -H, --hostname=HOST\n");
-  printf ("    %s\n", _("The name or address you want to query"));
-  printf (" -s, --server=HOST\n");
-  printf ("    %s\n", _("Optional DNS server you want to use for the lookup"));
-  printf (" -a, --expected-address=IP-ADDRESS|CIDR|HOST\n");
-  printf ("    %s\n", _("Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"));
-  printf ("    %s\n", _("with a dot (.). This option can be repeated multiple times (Returns OK if any"));
-  printf ("    %s\n", _("value matches)."));
-  printf (" -n, --expect-nxdomain\n");
-  printf ("    %s\n", _("Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"));
-  printf ("    %s\n", _("Cannot be used together with -a"));
-  printf (" -A, --expect-authority\n");
-  printf ("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
-  printf (" -w, --warning=seconds\n");
-  printf ("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
-  printf (" -c, --critical=seconds\n");
-  printf ("    %s\n", _("Return critical if elapsed time exceeds value. Default off"));
-  printf (" -L, --all\n");
-  printf ("    %s\n", _("Return critical if the list of expected addresses does not match all addresses"));
-  printf ("    %s\n", _("returned. Default off"));
-
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf (UT_SUPPORT);
+        return OK;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf("%s\n", _("This plugin uses the nslookup program to obtain the IP address for the given host/domain query."));
+        printf("%s\n", _("An optional DNS server to use may be specified."));
+        printf("%s\n", _("If no DNS server is specified, the default server(s) specified in /etc/resolv.conf will be used."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" -H, --hostname=HOST\n");
+        printf("    %s\n", _("The name or address you want to query"));
+        printf(" -s, --server=HOST\n");
+        printf("    %s\n", _("Optional DNS server you want to use for the lookup"));
+        printf(" -a, --expected-address=IP-ADDRESS|CIDR|HOST\n");
+        printf("    %s\n", _("Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"));
+        printf("    %s\n", _("with a dot (.). This option can be repeated multiple times (Returns OK if any"));
+        printf("    %s\n", _("value matches)."));
+        printf(" -n, --expect-nxdomain\n");
+        printf("    %s\n", _("Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"));
+        printf("    %s\n", _("Cannot be used together with -a"));
+        printf(" -A, --expect-authority\n");
+        printf("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
+        printf(" -w, --warning=seconds\n");
+        printf("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
+        printf(" -c, --critical=seconds\n");
+        printf("    %s\n", _("Return critical if elapsed time exceeds value. Default off"));
+        printf(" -L, --all\n");
+        printf("    %s\n", _("Return critical if the list of expected addresses does not match all addresses"));
+        printf("    %s\n", _("returned. Default off"));
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_SUPPORT);
+}
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf ("%s -H host [-s server] [-a expected-address] [-n] [-A] [-t timeout] [-w warn] [-c crit] [-L]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-s server] [-a expected-address] [-n] [-A] [-t timeout] [-w warn] [-c crit] [-L]\n", progname);
 }
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 212a134..19f6c04 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -1,124 +1,111 @@
 /*****************************************************************************
-* 
-* Monitoring check_dummy plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dummy plugin
-* 
-* This plugin will simply return the state corresponding to the numeric value
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_dummy plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dummy plugin
+ *
+ * This plugin will simply return the state corresponding to the numeric value
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_dummy";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 
-void print_help (void);
-void print_usage (void);
-
-
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  if (argc < 2)
-    usage4 (_("Could not parse arguments"));
-  else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
-    print_revision (progname, NP_VERSION);
-    exit (STATE_UNKNOWN);
-  }
-  else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) {
-    print_help ();
-    exit (STATE_UNKNOWN);
-  }
-  else if (!is_integer (argv[1]))
-    usage4 (_("Arguments to check_dummy must be an integer"));
-  else
-    result = atoi (argv[1]);
-
-  switch (result) {
-  case STATE_OK:
-    printf (_("OK"));
-    break;
-  case STATE_WARNING:
-    printf (_("WARNING"));
-    break;
-  case STATE_CRITICAL:
-    printf (_("CRITICAL"));
-    break;
-  case STATE_UNKNOWN:
-    printf (_("UNKNOWN"));
-    break;
-  default:
-    printf (_("UNKNOWN"));
-    printf (": ");
-    printf (_("Status %d is not a supported error state\n"), result);
-    return STATE_UNKNOWN;
-  }
-
-  if (argc >= 3)
-    printf (": %s", argv[2]);
-
-  printf("\n");
-
-  return result;
+static void print_help(void);
+void print_usage(void);
+
+int main(int argc, char **argv) {
+        int result = STATE_UNKNOWN;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        if (argc < 2)
+                usage4(_("Could not parse arguments"));
+        else if (strcmp(argv[1], "-V") == 0 || strcmp(argv[1], "--version") == 0) {
+                print_revision(progname, NP_VERSION);
+                exit(STATE_UNKNOWN);
+        } else if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) {
+                print_help();
+                exit(STATE_UNKNOWN);
+        } else if (!is_integer(argv[1]))
+                usage4(_("Arguments to check_dummy must be an integer"));
+        else
+                result = atoi(argv[1]);
+
+        switch (result) {
+        case STATE_OK:
+                printf(_("OK"));
+                break;
+        case STATE_WARNING:
+                printf(_("WARNING"));
+                break;
+        case STATE_CRITICAL:
+                printf(_("CRITICAL"));
+                break;
+        case STATE_UNKNOWN:
+                printf(_("UNKNOWN"));
+                break;
+        default:
+                printf(_("UNKNOWN"));
+                printf(": ");
+                printf(_("Status %d is not a supported error state\n"), result);
+                return STATE_UNKNOWN;
+        }
+
+        if (argc >= 3)
+                printf(": %s", argv[2]);
+
+        printf("\n");
+
+        return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
+        printf("%s\n", _("This plugin will simply return the state corresponding to the numeric value"));
 
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("%s\n", _("of the <state> argument with optional text"));
 
-  printf ("%s\n", _("This plugin will simply return the state corresponding to the numeric value"));
+        printf("\n\n");
 
-  printf ("%s\n", _("of the <state> argument with optional text"));
+        print_usage();
 
-  printf ("\n\n");
+        printf(UT_HELP_VRSN);
 
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s <integer state> [optional text]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s <integer state> [optional text]\n", progname);
 }
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 70d6f9f..49235e2 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_fping plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_disk plugin
-* 
-* This plugin will use the fping command to ping the specified host for a
-* fast check
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_fping plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_disk plugin
+ *
+ * This plugin will use the fping command to ping the specified host for a
+ * fast check
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_fping";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -40,488 +40,449 @@ const char *email = "devel@monitoring-plugins.org";
 #include <stdbool.h>
 
 enum {
-  PACKET_COUNT = 1,
-  PACKET_SIZE = 56,
-  PL = 0,
-  RTA = 1
+        PACKET_COUNT = 1,
+        PACKET_SIZE = 56,
+        PL = 0,
+        RTA = 1
 };
 
-int textscan (char *buf);
-int process_arguments (int, char **);
-int get_threshold (char *arg, char *rv[2]);
-void print_help (void);
-void print_usage (void);
-
-char *server_name = NULL;
-char *sourceip = NULL;
-char *sourceif = NULL;
-int packet_size = PACKET_SIZE;
-int packet_count = PACKET_COUNT;
-int target_timeout = 0;
-int packet_interval = 0;
-bool verbose = false;
-int cpl;
-int wpl;
-double crta;
-double wrta;
-bool cpl_p = false;
-bool wpl_p = false;
-bool alive_p = false;
-bool crta_p = false;
-bool wrta_p = false;
-
-int
-main (int argc, char **argv)
-{
-/* normally should be  int result = STATE_UNKNOWN; */
-
-  int status = STATE_UNKNOWN;
-  int result = 0;
-  char *fping_prog = NULL;
-  char *server = NULL;
-  char *command_line = NULL;
-  char *input_buffer = NULL;
-  char *option_string = "";
-  input_buffer = malloc (MAX_INPUT_BUFFER);
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR)
-    usage4 (_("Could not parse arguments"));
-
-  server = strscpy (server, server_name);
-
-  /* compose the command */
-  if (target_timeout)
-    xasprintf(&option_string, "%s-t %d ", option_string, target_timeout);
-  if (packet_interval)
-    xasprintf(&option_string, "%s-p %d ", option_string, packet_interval);
-  if (sourceip)
-    xasprintf(&option_string, "%s-S %s ", option_string, sourceip);
-  if (sourceif)
-    xasprintf(&option_string, "%s-I %s ", option_string, sourceif);
+static int textscan(char *buf);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int get_threshold(char *arg, char *rv[2]);
+static void print_help(void);
+void print_usage(void);
+
+static char *server_name = NULL;
+static char *sourceip = NULL;
+static char *sourceif = NULL;
+static int packet_size = PACKET_SIZE;
+static int packet_count = PACKET_COUNT;
+static int target_timeout = 0;
+static int packet_interval = 0;
+static bool verbose = false;
+static int cpl;
+static int wpl;
+static double crta;
+static double wrta;
+static bool cpl_p = false;
+static bool wpl_p = false;
+static bool alive_p = false;
+static bool crta_p = false;
+static bool wrta_p = false;
+
+int main(int argc, char **argv) {
+        /* normally should be  int result = STATE_UNKNOWN; */
+
+        int status = STATE_UNKNOWN;
+        int result = 0;
+        char *fping_prog = NULL;
+        char *server = NULL;
+        char *command_line = NULL;
+        char *input_buffer = NULL;
+        char *option_string = "";
+        input_buffer = malloc(MAX_INPUT_BUFFER);
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
+
+        server = strscpy(server, server_name);
+
+        /* compose the command */
+        if (target_timeout)
+                xasprintf(&option_string, "%s-t %d ", option_string, target_timeout);
+        if (packet_interval)
+                xasprintf(&option_string, "%s-p %d ", option_string, packet_interval);
+        if (sourceip)
+                xasprintf(&option_string, "%s-S %s ", option_string, sourceip);
+        if (sourceif)
+                xasprintf(&option_string, "%s-I %s ", option_string, sourceif);
 
 #ifdef PATH_TO_FPING6
-  if (address_family != AF_INET && is_inet6_addr(server))
-    fping_prog = strdup(PATH_TO_FPING6);
-  else
-    fping_prog = strdup(PATH_TO_FPING);
+        if (address_family != AF_INET && is_inet6_addr(server))
+                fping_prog = strdup(PATH_TO_FPING6);
+        else
+                fping_prog = strdup(PATH_TO_FPING);
 #else
-  fping_prog = strdup(PATH_TO_FPING);
+        fping_prog = strdup(PATH_TO_FPING);
 #endif
 
-  xasprintf (&command_line, "%s %s-b %d -c %d %s", fping_prog,
-            option_string, packet_size, packet_count, server);
-
-  if (verbose)
-    printf ("%s\n", command_line);
-
-  /* run the command */
-  child_process = spopen (command_line);
-  if (child_process == NULL) {
-    printf (_("Could not open pipe: %s\n"), command_line);
-    return STATE_UNKNOWN;
-  }
-
-  child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
-  if (child_stderr == NULL) {
-    printf (_("Could not open stderr for %s\n"), command_line);
-  }
-
-  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
-    if (verbose)
-      printf ("%s", input_buffer);
-    status = max_state (status, textscan (input_buffer));
-  }
-
-  /* If we get anything on STDERR, at least set warning */
-  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
-    status = max_state (status, STATE_WARNING);
-    if (verbose)
-      printf ("%s", input_buffer);
-    status = max_state (status, textscan (input_buffer));
-  }
-  (void) fclose (child_stderr);
-
-  /* close the pipe */
-  result = spclose (child_process);
-  if (result) {
-    /* need to use max_state not max */
-    status = max_state (status, STATE_WARNING);
-  }
-
-  if (result > 1 ) {
-    status = max_state (status, STATE_UNKNOWN);
-    if (result == 2) {
-      die (STATE_UNKNOWN, _("FPING UNKNOWN - IP address not found\n"));
-    }
-    if (result == 3) {
-      die (STATE_UNKNOWN, _("FPING UNKNOWN - invalid commandline argument\n"));
-    }
-    if (result == 4) {
-      die (STATE_UNKNOWN, _("FPING UNKNOWN - failed system call\n"));
-    }
-
-  }
-
-  printf ("FPING %s - %s\n", state_text (status), server_name);
-
-  return status;
+        xasprintf(&command_line, "%s %s-b %d -c %d %s", fping_prog, option_string, packet_size, packet_count, server);
+
+        if (verbose)
+                printf("%s\n", command_line);
+
+        /* run the command */
+        child_process = spopen(command_line);
+        if (child_process == NULL) {
+                printf(_("Could not open pipe: %s\n"), command_line);
+                return STATE_UNKNOWN;
+        }
+
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
+        if (child_stderr == NULL) {
+                printf(_("Could not open stderr for %s\n"), command_line);
+        }
+
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+                if (verbose)
+                        printf("%s", input_buffer);
+                status = max_state(status, textscan(input_buffer));
+        }
+
+        /* If we get anything on STDERR, at least set warning */
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                status = max_state(status, STATE_WARNING);
+                if (verbose)
+                        printf("%s", input_buffer);
+                status = max_state(status, textscan(input_buffer));
+        }
+        (void)fclose(child_stderr);
+
+        /* close the pipe */
+        result = spclose(child_process);
+        if (result) {
+                /* need to use max_state not max */
+                status = max_state(status, STATE_WARNING);
+        }
+
+        if (result > 1) {
+                status = max_state(status, STATE_UNKNOWN);
+                if (result == 2) {
+                        die(STATE_UNKNOWN, _("FPING UNKNOWN - IP address not found\n"));
+                }
+                if (result == 3) {
+                        die(STATE_UNKNOWN, _("FPING UNKNOWN - invalid commandline argument\n"));
+                }
+                if (result == 4) {
+                        die(STATE_UNKNOWN, _("FPING UNKNOWN - failed system call\n"));
+                }
+        }
+
+        printf("FPING %s - %s\n", state_text(status), server_name);
+
+        return status;
 }
 
-
-int textscan (char *buf) {
-  char *rtastr = NULL;
-  char *losstr = NULL;
-  char *xmtstr = NULL;
-  double loss;
-  double rta;
-  double xmt;
-  int status = STATE_UNKNOWN;
-
-  /* stops testing after the first successful reply. */
-  if (alive_p && strstr(buf, "avg, 0% loss)")) {
-    rtastr = strstr (buf, "ms (");
-    rtastr = 1 + index(rtastr, '(');
-    rta = strtod(rtastr, NULL);
-    loss=strtod("0",NULL);
-    die (STATE_OK,
-         _("FPING %s - %s (rta=%f ms)|%s\n"),
-         state_text (STATE_OK), server_name,rta,
-                 /* No loss since we only waited for the first reply
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100), */
-         fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, true, 0, false, 0));
-  }
-
-  if (strstr (buf, "not found")) {
-    die (STATE_CRITICAL, _("FPING UNKNOWN - %s not found\n"), server_name);
-
-  }
-  else if (strstr (buf, "is unreachable") || strstr (buf, "Unreachable")) {
-    die (STATE_CRITICAL, _("FPING CRITICAL - %s is unreachable\n"),
-               "host");
-
-  }
-  else if (strstr (buf, "Operation not permitted") || strstr (buf, "No such device") ) {
-    die (STATE_UNKNOWN, _("FPING UNKNOWN - %s parameter error\n"),
-               "host");
-  }
-  else if (strstr (buf, "is down")) {
-    die (STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
-
-  }
-  else if (strstr (buf, "is alive")) {
-    status = STATE_OK;
-
-  }
-  else if (strstr (buf, "xmt/rcv/%loss") && strstr (buf, "min/avg/max")) {
-    losstr = strstr (buf, "=");
-    losstr = 1 + strstr (losstr, "/");
-    losstr = 1 + strstr (losstr, "/");
-    rtastr = strstr (buf, "min/avg/max");
-    rtastr = strstr (rtastr, "=");
-    rtastr = 1 + index (rtastr, '/');
-    loss = strtod (losstr, NULL);
-    rta = strtod (rtastr, NULL);
-    if (cpl_p && loss > cpl)
-      status = STATE_CRITICAL;
-    else if (crta_p && rta > crta)
-      status = STATE_CRITICAL;
-    else if (wpl_p && loss > wpl)
-      status = STATE_WARNING;
-    else if (wrta_p && rta > wrta)
-      status = STATE_WARNING;
-    else
-      status = STATE_OK;
-    die (status,
-          _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"),
-         state_text (status), server_name, loss, rta,
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100),
-         fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, true, 0, false, 0));
-
-  }
-  else if(strstr (buf, "xmt/rcv/%loss") ) {
-    /* no min/max/avg if host was unreachable in fping v2.2.b1 */
-    /* in v2.4b2: 10.99.0.1 : xmt/rcv/%loss = 0/0/0% */
-    losstr = strstr (buf, "=");
-    xmtstr = 1 + losstr;
-    xmt = strtod (xmtstr, NULL);
-    if(xmt == 0)
-        die (STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
-    losstr = 1 + strstr (losstr, "/");
-    losstr = 1 + strstr (losstr, "/");
-    loss = strtod (losstr, NULL);
-    if (atoi(losstr) == 100)
-      status = STATE_CRITICAL;
-    else if (cpl_p && loss > cpl)
-      status = STATE_CRITICAL;
-    else if (wpl_p && loss > wpl)
-      status = STATE_WARNING;
-    else
-      status = STATE_OK;
-    /* loss=%.0f%%;%d;%d;0;100 */
-    die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
-         state_text (status), server_name, loss ,
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100));
-
-  }
-  else {
-    status = max_state (status, STATE_WARNING);
-  }
-
-  return status;
+int textscan(char *buf) {
+        char *rtastr = NULL;
+        char *losstr = NULL;
+        char *xmtstr = NULL;
+        double loss;
+        double rta;
+        double xmt;
+        int status = STATE_UNKNOWN;
+
+        /* stops testing after the first successful reply. */
+        if (alive_p && strstr(buf, "avg, 0% loss)")) {
+                rtastr = strstr(buf, "ms (");
+                rtastr = 1 + index(rtastr, '(');
+                rta = strtod(rtastr, NULL);
+                loss = strtod("0", NULL);
+                die(STATE_OK, _("FPING %s - %s (rta=%f ms)|%s\n"), state_text(STATE_OK), server_name, rta,
+                        /* No loss since we only waited for the first reply
+                        perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100), */
+                        fperfdata("rta", rta / 1.0e3, "s", wrta_p, wrta / 1.0e3, crta_p, crta / 1.0e3, true, 0, false, 0));
+        }
+
+        if (strstr(buf, "not found")) {
+                die(STATE_CRITICAL, _("FPING UNKNOWN - %s not found\n"), server_name);
+
+        } else if (strstr(buf, "is unreachable") || strstr(buf, "Unreachable")) {
+                die(STATE_CRITICAL, _("FPING CRITICAL - %s is unreachable\n"), "host");
+
+        } else if (strstr(buf, "Operation not permitted") || strstr(buf, "No such device")) {
+                die(STATE_UNKNOWN, _("FPING UNKNOWN - %s parameter error\n"), "host");
+        } else if (strstr(buf, "is down")) {
+                die(STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
+
+        } else if (strstr(buf, "is alive")) {
+                status = STATE_OK;
+
+        } else if (strstr(buf, "xmt/rcv/%loss") && strstr(buf, "min/avg/max")) {
+                losstr = strstr(buf, "=");
+                losstr = 1 + strstr(losstr, "/");
+                losstr = 1 + strstr(losstr, "/");
+                rtastr = strstr(buf, "min/avg/max");
+                rtastr = strstr(rtastr, "=");
+                rtastr = 1 + index(rtastr, '/');
+                loss = strtod(losstr, NULL);
+                rta = strtod(rtastr, NULL);
+                if (cpl_p && loss > cpl)
+                        status = STATE_CRITICAL;
+                else if (crta_p && rta > crta)
+                        status = STATE_CRITICAL;
+                else if (wpl_p && loss > wpl)
+                        status = STATE_WARNING;
+                else if (wrta_p && rta > wrta)
+                        status = STATE_WARNING;
+                else
+                        status = STATE_OK;
+                die(status, _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"), state_text(status), server_name, loss, rta,
+                        perfdata("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100),
+                        fperfdata("rta", rta / 1.0e3, "s", wrta_p, wrta / 1.0e3, crta_p, crta / 1.0e3, true, 0, false, 0));
+
+        } else if (strstr(buf, "xmt/rcv/%loss")) {
+                /* no min/max/avg if host was unreachable in fping v2.2.b1 */
+                /* in v2.4b2: 10.99.0.1 : xmt/rcv/%loss = 0/0/0% */
+                losstr = strstr(buf, "=");
+                xmtstr = 1 + losstr;
+                xmt = strtod(xmtstr, NULL);
+                if (xmt == 0)
+                        die(STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
+                losstr = 1 + strstr(losstr, "/");
+                losstr = 1 + strstr(losstr, "/");
+                loss = strtod(losstr, NULL);
+                if (atoi(losstr) == 100)
+                        status = STATE_CRITICAL;
+                else if (cpl_p && loss > cpl)
+                        status = STATE_CRITICAL;
+                else if (wpl_p && loss > wpl)
+                        status = STATE_WARNING;
+                else
+                        status = STATE_OK;
+                /* loss=%.0f%%;%d;%d;0;100 */
+                die(status, _("FPING %s - %s (loss=%.0f%% )|%s\n"), state_text(status), server_name, loss,
+                        perfdata("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100));
+
+        } else {
+                status = max_state(status, STATE_WARNING);
+        }
+
+        return status;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-  char *rv[2];
-
-  int option = 0;
-  static struct option longopts[] = {
-    {"hostname", required_argument, 0, 'H'},
-    {"sourceip", required_argument, 0, 'S'},
-    {"sourceif", required_argument, 0, 'I'},
-    {"critical", required_argument, 0, 'c'},
-    {"warning", required_argument, 0, 'w'},
-        {"alive", no_argument, 0, 'a'},
-    {"bytes", required_argument, 0, 'b'},
-    {"number", required_argument, 0, 'n'},
-    {"target-timeout", required_argument, 0, 'T'},
-    {"interval", required_argument, 0, 'i'},
-    {"verbose", no_argument, 0, 'v'},
-    {"version", no_argument, 0, 'V'},
-    {"help", no_argument, 0, 'h'},
-    {"use-ipv4", no_argument, 0, '4'},
-    {"use-ipv6", no_argument, 0, '6'},
-    {0, 0, 0, 0}
-  };
-
-  rv[PL] = NULL;
-  rv[RTA] = NULL;
-
-  if (argc < 2)
-    return ERROR;
-
-  if (!is_option (argv[1])) {
-    server_name = argv[1];
-    argv[1] = argv[0];
-    argv = &argv[1];
-    argc--;
-  }
-
-  while (1) {
-    c = getopt_long (argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:46", longopts, &option);
-
-    if (c == -1 || c == EOF || c == 1)
-      break;
-
-    switch (c) {
-    case '?':                 /* print short usage statement if args not parsable */
-      usage5 ();
-    case 'a':                 /* host alive mode */
-      alive_p = true;
-      break;
-    case 'h':                 /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V':                 /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'v':                 /* verbose mode */
-      verbose = true;
-      break;
-    case 'H':                 /* hostname */
-      if (is_host (optarg) == false) {
-        usage2 (_("Invalid hostname/address"), optarg);
-      }
-      server_name = strscpy (server_name, optarg);
-      break;
-    case 'S':                 /* sourceip */
-      if (is_host (optarg) == false) {
-        usage2 (_("Invalid hostname/address"), optarg);
-      }
-      sourceip = strscpy (sourceip, optarg);
-      break;
-    case 'I':                 /* sourceip */
-      sourceif = strscpy (sourceif, optarg);
+int process_arguments(int argc, char **argv) {
+        int c;
+        char *rv[2];
+
+        int option = 0;
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"sourceip", required_argument, 0, 'S'},
+                                                                           {"sourceif", required_argument, 0, 'I'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"alive", no_argument, 0, 'a'},
+                                                                           {"bytes", required_argument, 0, 'b'},
+                                                                           {"number", required_argument, 0, 'n'},
+                                                                           {"target-timeout", required_argument, 0, 'T'},
+                                                                           {"interval", required_argument, 0, 'i'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {0, 0, 0, 0}};
+
+        rv[PL] = NULL;
+        rv[RTA] = NULL;
+
+        if (argc < 2)
+                return ERROR;
+
+        if (!is_option(argv[1])) {
+                server_name = argv[1];
+                argv[1] = argv[0];
+                argv = &argv[1];
+                argc--;
+        }
+
+        while (1) {
+                c = getopt_long(argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:46", longopts, &option);
+
+                if (c == -1 || c == EOF || c == 1)
+                        break;
+
+                switch (c) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'a': /* host alive mode */
+                        alive_p = true;
+                        break;
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* verbose mode */
+                        verbose = true;
+                        break;
+                case 'H': /* hostname */
+                        if (is_host(optarg) == false) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        }
+                        server_name = strscpy(server_name, optarg);
+                        break;
+                case 'S': /* sourceip */
+                        if (is_host(optarg) == false) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        }
+                        sourceip = strscpy(sourceip, optarg);
+                        break;
+                case 'I': /* sourceip */
+                        sourceif = strscpy(sourceif, optarg);
+                        break;
+                case '4': /* IPv4 only */
+                        address_family = AF_INET;
                         break;
-    case '4':                 /* IPv4 only */
-      address_family = AF_INET;
-      break;
-    case '6':                 /* IPv6 only */
+                case '6': /* IPv6 only */
 #ifdef USE_IPV6
-      address_family = AF_INET6;
+                        address_family = AF_INET6;
 #else
-      usage (_("IPv6 support not available\n"));
+                        usage(_("IPv6 support not available\n"));
 #endif
-      break;
-    case 'c':
-      get_threshold (optarg, rv);
-      if (rv[RTA]) {
-        crta = strtod (rv[RTA], NULL);
-        crta_p = true;
-        rv[RTA] = NULL;
-      }
-      if (rv[PL]) {
-        cpl = atoi (rv[PL]);
-        cpl_p = true;
-        rv[PL] = NULL;
-      }
-      break;
-    case 'w':
-      get_threshold (optarg, rv);
-      if (rv[RTA]) {
-        wrta = strtod (rv[RTA], NULL);
-        wrta_p = true;
-        rv[RTA] = NULL;
-      }
-      if (rv[PL]) {
-        wpl = atoi (rv[PL]);
-        wpl_p = true;
-        rv[PL] = NULL;
-      }
-      break;
-    case 'b':                 /* bytes per packet */
-      if (is_intpos (optarg))
-        packet_size = atoi (optarg);
-      else
-        usage (_("Packet size must be a positive integer"));
-      break;
-    case 'n':                 /* number of packets */
-      if (is_intpos (optarg))
-        packet_count = atoi (optarg);
-      else
-        usage (_("Packet count must be a positive integer"));
-      break;
-    case 'T':                 /* timeout in msec */
-      if (is_intpos (optarg))
-        target_timeout = atoi (optarg);
-      else
-        usage (_("Target timeout must be a positive integer"));
-      break;
-    case 'i':                 /* interval in msec */
-      if (is_intpos (optarg))
-        packet_interval = atoi (optarg);
-      else
-        usage (_("Interval must be a positive integer"));
-      break;
-    }
-  }
-
-  if (server_name == NULL)
-    usage4 (_("Hostname was not supplied"));
-
-  return OK;
-}
+                        break;
+                case 'c':
+                        get_threshold(optarg, rv);
+                        if (rv[RTA]) {
+                                crta = strtod(rv[RTA], NULL);
+                                crta_p = true;
+                                rv[RTA] = NULL;
+                        }
+                        if (rv[PL]) {
+                                cpl = atoi(rv[PL]);
+                                cpl_p = true;
+                                rv[PL] = NULL;
+                        }
+                        break;
+                case 'w':
+                        get_threshold(optarg, rv);
+                        if (rv[RTA]) {
+                                wrta = strtod(rv[RTA], NULL);
+                                wrta_p = true;
+                                rv[RTA] = NULL;
+                        }
+                        if (rv[PL]) {
+                                wpl = atoi(rv[PL]);
+                                wpl_p = true;
+                                rv[PL] = NULL;
+                        }
+                        break;
+                case 'b': /* bytes per packet */
+                        if (is_intpos(optarg))
+                                packet_size = atoi(optarg);
+                        else
+                                usage(_("Packet size must be a positive integer"));
+                        break;
+                case 'n': /* number of packets */
+                        if (is_intpos(optarg))
+                                packet_count = atoi(optarg);
+                        else
+                                usage(_("Packet count must be a positive integer"));
+                        break;
+                case 'T': /* timeout in msec */
+                        if (is_intpos(optarg))
+                                target_timeout = atoi(optarg);
+                        else
+                                usage(_("Target timeout must be a positive integer"));
+                        break;
+                case 'i': /* interval in msec */
+                        if (is_intpos(optarg))
+                                packet_interval = atoi(optarg);
+                        else
+                                usage(_("Interval must be a positive integer"));
+                        break;
+                }
+        }
 
+        if (server_name == NULL)
+                usage4(_("Hostname was not supplied"));
 
-int
-get_threshold (char *arg, char *rv[2])
-{
-  char *arg1 = NULL;
-  char *arg2 = NULL;
-
-  arg1 = strscpy (arg1, arg);
-  if (strpbrk (arg1, ",:"))
-    arg2 = 1 + strpbrk (arg1, ",:");
-
-  if (arg2) {
-    arg1[strcspn (arg1, ",:")] = 0;
-    if (strstr (arg1, "%") && strstr (arg2, "%"))
-      die (STATE_UNKNOWN,
-                 _("%s: Only one threshold may be packet loss (%s)\n"), progname,
-                 arg);
-    if (!strstr (arg1, "%") && !strstr (arg2, "%"))
-      die (STATE_UNKNOWN,
-                 _("%s: Only one threshold must be packet loss (%s)\n"),
-                 progname, arg);
-  }
-
-  if (arg2 && strstr (arg2, "%")) {
-    rv[PL] = arg2;
-    rv[RTA] = arg1;
-  }
-  else if (arg2) {
-    rv[PL] = arg1;
-    rv[RTA] = arg2;
-  }
-  else if (strstr (arg1, "%")) {
-    rv[PL] = arg1;
-  }
-  else {
-    rv[RTA] = arg1;
-  }
-
-  return OK;
+        return OK;
 }
 
+int get_threshold(char *arg, char *rv[2]) {
+        char *arg1 = NULL;
+        char *arg2 = NULL;
+
+        arg1 = strscpy(arg1, arg);
+        if (strpbrk(arg1, ",:"))
+                arg2 = 1 + strpbrk(arg1, ",:");
+
+        if (arg2) {
+                arg1[strcspn(arg1, ",:")] = 0;
+                if (strstr(arg1, "%") && strstr(arg2, "%"))
+                        die(STATE_UNKNOWN, _("%s: Only one threshold may be packet loss (%s)\n"), progname, arg);
+                if (!strstr(arg1, "%") && !strstr(arg2, "%"))
+                        die(STATE_UNKNOWN, _("%s: Only one threshold must be packet loss (%s)\n"), progname, arg);
+        }
+
+        if (arg2 && strstr(arg2, "%")) {
+                rv[PL] = arg2;
+                rv[RTA] = arg1;
+        } else if (arg2) {
+                rv[PL] = arg1;
+                rv[RTA] = arg2;
+        } else if (strstr(arg1, "%")) {
+                rv[PL] = arg1;
+        } else {
+                rv[RTA] = arg1;
+        }
+
+        return OK;
+}
 
-void print_help (void) {
+void print_help(void) {
 
-  print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-  printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
+        printf(COPYRIGHT, copyright, email);
 
-  printf ("%s\n", _("This plugin will use the fping command to ping the specified host for a fast check"));
+        printf("%s\n", _("This plugin will use the fping command to ping the specified host for a fast check"));
 
-  printf ("%s\n", _("Note that it is necessary to set the suid flag on fping."));
+        printf("%s\n", _("Note that it is necessary to set the suid flag on fping."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-  print_usage ();
+        print_usage();
 
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-  printf (UT_IPv46);
+        printf(UT_IPv46);
 
-  printf (" %s\n", "-H, --hostname=HOST");
-  printf ("    %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)"));
-  printf (" %s\n", "-w, --warning=THRESHOLD");
-  printf ("    %s\n", _("warning threshold pair"));
-  printf (" %s\n", "-c, --critical=THRESHOLD");
-  printf ("    %s\n", _("critical threshold pair"));
-  printf (" %s\n", "-a, --alive");
-  printf ("    %s\n", _("Return OK after first successful reply"));
-  printf (" %s\n", "-b, --bytes=INTEGER");
-  printf ("    %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE);
-  printf (" %s\n", "-n, --number=INTEGER");
-  printf ("    %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT);
-  printf (" %s\n", "-T, --target-timeout=INTEGER");
-  printf ("    %s (default: fping's default for -t)\n", _("Target timeout (ms)"));
-  printf (" %s\n", "-i, --interval=INTEGER");
-  printf ("    %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"));
-  printf (" %s\n", "-S, --sourceip=HOST");
-  printf ("    %s\n", _("name or IP Address of sourceip"));
-  printf (" %s\n", "-I, --sourceif=IF");
-  printf ("    %s\n", _("source interface name"));
-  printf (UT_VERBOSE);
-  printf ("\n");
-  printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
-  printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
-  printf (" %s\n", _("packet loss to trigger an alarm state."));
+        printf(" %s\n", "-H, --hostname=HOST");
+        printf("    %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("warning threshold pair"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("critical threshold pair"));
+        printf(" %s\n", "-a, --alive");
+        printf("    %s\n", _("Return OK after first successful reply"));
+        printf(" %s\n", "-b, --bytes=INTEGER");
+        printf("    %s (default: %d)\n", _("size of ICMP packet"), PACKET_SIZE);
+        printf(" %s\n", "-n, --number=INTEGER");
+        printf("    %s (default: %d)\n", _("number of ICMP packets to send"), PACKET_COUNT);
+        printf(" %s\n", "-T, --target-timeout=INTEGER");
+        printf("    %s (default: fping's default for -t)\n", _("Target timeout (ms)"));
+        printf(" %s\n", "-i, --interval=INTEGER");
+        printf("    %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"));
+        printf(" %s\n", "-S, --sourceip=HOST");
+        printf("    %s\n", _("name or IP Address of sourceip"));
+        printf(" %s\n", "-I, --sourceif=IF");
+        printf("    %s\n", _("source interface name"));
+        printf(UT_VERBOSE);
+        printf("\n");
+        printf(" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
+        printf(" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
+        printf(" %s\n", _("packet loss to trigger an alarm state."));
 
-  printf ("\n");
-  printf (" %s\n", _("IPv4 is used by default. Specify -6 to use IPv6."));
+        printf("\n");
+        printf(" %s\n", _("IPv4 is used by default. Specify -6 to use IPv6."));
 
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s <host_address> -w limit -c limit [-b size] [-n number] [-T number] [-i number]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s <host_address> -w limit -c limit [-b size] [-n number] [-T number] [-i number]\n", progname);
 }
diff --git a/plugins/check_game.c b/plugins/check_game.c
index ca12697..619277e 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -1,335 +1,308 @@
 /*****************************************************************************
-* 
-* Monitoring check_game plugin
-* 
-* License: GPL
-* Copyright (c) 2002-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_game plugin
-* 
-* This plugin tests game server connections with the specified host.
-* using the qstat program
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*
-*****************************************************************************/
+ *
+ * Monitoring check_game plugin
+ *
+ * License: GPL
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_game plugin
+ *
+ * This plugin tests game server connections with the specified host.
+ * using the qstat program
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_game";
-const char *copyright = "2002-2007";
+const char *copyright = "2002-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "runcmd.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static void print_help(void);
+void print_usage(void);
 
-#define QSTAT_DATA_DELIMITER  ","
+#define QSTAT_DATA_DELIMITER ","
 
-#define QSTAT_HOST_ERROR  "ERROR"
-#define QSTAT_HOST_DOWN   "DOWN"
-#define QSTAT_HOST_TIMEOUT  "TIMEOUT"
+#define QSTAT_HOST_ERROR      "ERROR"
+#define QSTAT_HOST_DOWN       "DOWN"
+#define QSTAT_HOST_TIMEOUT    "TIMEOUT"
 #define QSTAT_MAX_RETURN_ARGS 12
 
-char *server_ip;
-char *game_type;
-int port = 0;
-
-bool verbose = false;
-
-int qstat_game_players_max = -1;
-int qstat_game_players = -1;
-int qstat_game_field = -1;
-int qstat_map_field = -1;
-int qstat_ping_field = -1;
-
-
-int
-main (int argc, char **argv)
-{
-  char *command_line;
-  int result = STATE_UNKNOWN;
-  char *p, *ret[QSTAT_MAX_RETURN_ARGS];
-  size_t i = 0;
-  output chld_out;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR)
-    usage_va(_("Could not parse arguments"));
-
-  result = STATE_OK;
-
-  /* create the command line to execute */
-  xasprintf (&command_line, "%s -raw %s -%s %s",
-            PATH_TO_QSTAT, QSTAT_DATA_DELIMITER, game_type, server_ip);
-
-  if (port)
-    xasprintf (&command_line, "%s:%-d", command_line, port);
-
-  if (verbose)
-    printf ("%s\n", command_line);
-
-  /* run the command. historically, this plugin ignores output on stderr,
-   * as well as return status of the qstat program */
-  (void)np_runcmd(command_line, &chld_out, NULL, 0);
-
-  /* sanity check */
-  /* was thinking about running qstat without any options, capturing the
-     -default line, parsing it & making an array of all know server types
-     but thought this would be too much hassle considering this is a tool
-     for intelligent sysadmins (ha). Could put a static array of known
-     server types in a header file but then we'd be limiting ourselves
-
-     In the end, I figured I'd simply let an error occur & then trap it
-   */
-
-  if (!strncmp (chld_out.line[0], "unknown option", 14)) {
-    printf (_("CRITICAL - Host type parameter incorrect!\n"));
-    result = STATE_CRITICAL;
-    return result;
-  }
-
-  p = (char *) strtok (chld_out.line[0], QSTAT_DATA_DELIMITER);
-  while (p != NULL) {
-    ret[i] = p;
-    p = (char *) strtok (NULL, QSTAT_DATA_DELIMITER);
-    i++;
-    if (i >= QSTAT_MAX_RETURN_ARGS)
-      break;
-  }
-
-  if (strstr (ret[2], QSTAT_HOST_ERROR)) {
-    printf (_("CRITICAL - Host not found\n"));
-    result = STATE_CRITICAL;
-  }
-  else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
-    printf (_("CRITICAL - Game server down or unavailable\n"));
-    result = STATE_CRITICAL;
-  }
-  else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
-    printf (_("CRITICAL - Game server timeout\n"));
-    result = STATE_CRITICAL;
-  }
-  else {
-    printf ("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n",
-            ret[qstat_game_players],
-            ret[qstat_game_players_max],
-            ret[qstat_game_field],
-            ret[qstat_map_field],
-            ret[qstat_ping_field],
-            perfdata ("players", atol(ret[qstat_game_players]), "",
-                      false, 0, false, 0,
-                      true, 0, true, atol(ret[qstat_game_players_max])),
-            fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
-                      false, 0, false, 0,
-                      true, 0, false, 0));
-  }
-
-  return result;
+static char *server_ip;
+static char *game_type;
+static int port = 0;
+
+static bool verbose = false;
+
+static int qstat_game_players_max = -1;
+static int qstat_game_players = -1;
+static int qstat_game_field = -1;
+static int qstat_map_field = -1;
+static int qstat_ping_field = -1;
+
+int main(int argc, char **argv) {
+        char *command_line;
+        int result = STATE_UNKNOWN;
+        char *p;
+        char *ret[QSTAT_MAX_RETURN_ARGS];
+        size_t i = 0;
+        output chld_out;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        if (process_arguments(argc, argv) == ERROR)
+                usage_va(_("Could not parse arguments"));
+
+        result = STATE_OK;
+
+        /* create the command line to execute */
+        xasprintf(&command_line, "%s -raw %s -%s %s", PATH_TO_QSTAT, QSTAT_DATA_DELIMITER, game_type, server_ip);
+
+        if (port)
+                xasprintf(&command_line, "%s:%-d", command_line, port);
+
+        if (verbose)
+                printf("%s\n", command_line);
+
+        /* run the command. historically, this plugin ignores output on stderr,
+         * as well as return status of the qstat program */
+        (void)np_runcmd(command_line, &chld_out, NULL, 0);
+
+        /* sanity check */
+        /* was thinking about running qstat without any options, capturing the
+           -default line, parsing it & making an array of all know server types
+           but thought this would be too much hassle considering this is a tool
+           for intelligent sysadmins (ha). Could put a static array of known
+           server types in a header file but then we'd be limiting ourselves
+
+           In the end, I figured I'd simply let an error occur & then trap it
+         */
+
+        if (!strncmp(chld_out.line[0], "unknown option", 14)) {
+                printf(_("CRITICAL - Host type parameter incorrect!\n"));
+                result = STATE_CRITICAL;
+                return result;
+        }
+
+        p = (char *)strtok(chld_out.line[0], QSTAT_DATA_DELIMITER);
+        while (p != NULL) {
+                ret[i] = p;
+                p = (char *)strtok(NULL, QSTAT_DATA_DELIMITER);
+                i++;
+                if (i >= QSTAT_MAX_RETURN_ARGS)
+                        break;
+        }
+
+        if (strstr(ret[2], QSTAT_HOST_ERROR)) {
+                printf(_("CRITICAL - Host not found\n"));
+                result = STATE_CRITICAL;
+        } else if (strstr(ret[2], QSTAT_HOST_DOWN)) {
+                printf(_("CRITICAL - Game server down or unavailable\n"));
+                result = STATE_CRITICAL;
+        } else if (strstr(ret[2], QSTAT_HOST_TIMEOUT)) {
+                printf(_("CRITICAL - Game server timeout\n"));
+                result = STATE_CRITICAL;
+        } else {
+                printf("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n", ret[qstat_game_players], ret[qstat_game_players_max], ret[qstat_game_field],
+                           ret[qstat_map_field], ret[qstat_ping_field],
+                           perfdata("players", atol(ret[qstat_game_players]), "", false, 0, false, 0, true, 0, true, atol(ret[qstat_game_players_max])),
+                           fperfdata("ping", strtod(ret[qstat_ping_field], NULL), "", false, 0, false, 0, true, 0, false, 0));
+        }
+
+        return result;
 }
 
-
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-
-  int opt_index = 0;
-  static struct option long_opts[] = {
-    {"help", no_argument, 0, 'h'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    {"timeout", required_argument, 0, 't'},
-    {"hostname", required_argument, 0, 'H'},
-    {"port", required_argument, 0, 'P'},
-    {"game-type", required_argument, 0, 'G'},
-    {"map-field", required_argument, 0, 'm'},
-    {"ping-field", required_argument, 0, 'p'},
-    {"game-field", required_argument, 0, 'g'},
-    {"players-field", required_argument, 0, 129},
-    {"max-players-field", required_argument, 0, 130},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  for (c = 1; c < argc; c++) {
-    if (strcmp ("-mf", argv[c]) == 0)
-      strcpy (argv[c], "-m");
-    else if (strcmp ("-pf", argv[c]) == 0)
-      strcpy (argv[c], "-p");
-    else if (strcmp ("-gf", argv[c]) == 0)
-      strcpy (argv[c], "-g");
-  }
-
-  while (1) {
-    c = getopt_long (argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 'h': /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V': /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'v': /* version */
-      verbose = true;
-      break;
-    case 't': /* timeout period */
-      timeout_interval = atoi (optarg);
-      break;
-    case 'H': /* hostname */
-      if (strlen (optarg) >= MAX_HOST_ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      server_ip = optarg;
-      break;
-    case 'P': /* port */
-      port = atoi (optarg);
-      break;
-    case 'G': /* hostname */
-      if (strlen (optarg) >= MAX_INPUT_BUFFER)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      game_type = optarg;
-      break;
-    case 'p': /* index of ping field */
-      qstat_ping_field = atoi (optarg);
-      if (qstat_ping_field < 0 || qstat_ping_field > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 'm': /* index on map field */
-      qstat_map_field = atoi (optarg);
-      if (qstat_map_field < 0 || qstat_map_field > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 'g': /* index of game field */
-      qstat_game_field = atoi (optarg);
-      if (qstat_game_field < 0 || qstat_game_field > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 129: /* index of player count field */
-      qstat_game_players = atoi (optarg);
-      if (qstat_game_players_max == 0)
-        qstat_game_players_max = qstat_game_players - 1;
-      if (qstat_game_players < 0 || qstat_game_players > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 130: /* index of max players field */
-      qstat_game_players_max = atoi (optarg);
-      if (qstat_game_players_max < 0 || qstat_game_players_max > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    default: /* args not parsable */
-      usage5();
-    }
-  }
-
-  c = optind;
-  /* first option is the game type */
-  if (!game_type && c<argc)
-    game_type = strdup (argv[c++]);
-
-  /* Second option is the server name */
-  if (!server_ip && c<argc)
-    server_ip = strdup (argv[c++]);
-
-  return validate_arguments ();
+int process_arguments(int argc, char **argv) {
+        int c;
+
+        int opt_index = 0;
+        static struct option long_opts[] = {{"help", no_argument, 0, 'h'},
+                                                                                {"version", no_argument, 0, 'V'},
+                                                                                {"verbose", no_argument, 0, 'v'},
+                                                                                {"timeout", required_argument, 0, 't'},
+                                                                                {"hostname", required_argument, 0, 'H'},
+                                                                                {"port", required_argument, 0, 'P'},
+                                                                                {"game-type", required_argument, 0, 'G'},
+                                                                                {"map-field", required_argument, 0, 'm'},
+                                                                                {"ping-field", required_argument, 0, 'p'},
+                                                                                {"game-field", required_argument, 0, 'g'},
+                                                                                {"players-field", required_argument, 0, 129},
+                                                                                {"max-players-field", required_argument, 0, 130},
+                                                                                {0, 0, 0, 0}};
+
+        if (argc < 2)
+                return ERROR;
+
+        for (c = 1; c < argc; c++) {
+                if (strcmp("-mf", argv[c]) == 0)
+                        strcpy(argv[c], "-m");
+                else if (strcmp("-pf", argv[c]) == 0)
+                        strcpy(argv[c], "-p");
+                else if (strcmp("-gf", argv[c]) == 0)
+                        strcpy(argv[c], "-g");
+        }
+
+        while (1) {
+                c = getopt_long(argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
+
+                if (c == -1 || c == EOF)
+                        break;
+
+                switch (c) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* version */
+                        verbose = true;
+                        break;
+                case 't': /* timeout period */
+                        timeout_interval = atoi(optarg);
+                        break;
+                case 'H': /* hostname */
+                        if (strlen(optarg) >= MAX_HOST_ADDRESS_LENGTH)
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        server_ip = optarg;
+                        break;
+                case 'P': /* port */
+                        port = atoi(optarg);
+                        break;
+                case 'G': /* hostname */
+                        if (strlen(optarg) >= MAX_INPUT_BUFFER)
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        game_type = optarg;
+                        break;
+                case 'p': /* index of ping field */
+                        qstat_ping_field = atoi(optarg);
+                        if (qstat_ping_field < 0 || qstat_ping_field > QSTAT_MAX_RETURN_ARGS)
+                                return ERROR;
+                        break;
+                case 'm': /* index on map field */
+                        qstat_map_field = atoi(optarg);
+                        if (qstat_map_field < 0 || qstat_map_field > QSTAT_MAX_RETURN_ARGS)
+                                return ERROR;
+                        break;
+                case 'g': /* index of game field */
+                        qstat_game_field = atoi(optarg);
+                        if (qstat_game_field < 0 || qstat_game_field > QSTAT_MAX_RETURN_ARGS)
+                                return ERROR;
+                        break;
+                case 129: /* index of player count field */
+                        qstat_game_players = atoi(optarg);
+                        if (qstat_game_players_max == 0)
+                                qstat_game_players_max = qstat_game_players - 1;
+                        if (qstat_game_players < 0 || qstat_game_players > QSTAT_MAX_RETURN_ARGS)
+                                return ERROR;
+                        break;
+                case 130: /* index of max players field */
+                        qstat_game_players_max = atoi(optarg);
+                        if (qstat_game_players_max < 0 || qstat_game_players_max > QSTAT_MAX_RETURN_ARGS)
+                                return ERROR;
+                        break;
+                default: /* args not parsable */
+                        usage5();
+                }
+        }
+
+        c = optind;
+        /* first option is the game type */
+        if (!game_type && c < argc)
+                game_type = strdup(argv[c++]);
+
+        /* Second option is the server name */
+        if (!server_ip && c < argc)
+                server_ip = strdup(argv[c++]);
+
+        return validate_arguments();
 }
 
+int validate_arguments(void) {
+        if (qstat_game_players_max < 0)
+                qstat_game_players_max = 4;
 
-int
-validate_arguments (void)
-{
-  if (qstat_game_players_max < 0)
-    qstat_game_players_max = 4;
+        if (qstat_game_players < 0)
+                qstat_game_players = 5;
 
-  if (qstat_game_players < 0)
-    qstat_game_players = 5;
+        if (qstat_game_field < 0)
+                qstat_game_field = 2;
 
-  if (qstat_game_field < 0)
-    qstat_game_field = 2;
+        if (qstat_map_field < 0)
+                qstat_map_field = 3;
 
-  if (qstat_map_field < 0)
-    qstat_map_field = 3;
+        if (qstat_ping_field < 0)
+                qstat_ping_field = 5;
 
-  if (qstat_ping_field < 0)
-    qstat_ping_field = 5;
-
-  return OK;
+        return OK;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
-
-  printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
+        printf(COPYRIGHT, copyright, email);
 
-  printf (_("This plugin tests game server connections with the specified host."));
+        printf(_("This plugin tests game server connections with the specified host."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-  print_usage ();
+        print_usage();
 
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-  printf (" %s\n", "-p");
-  printf ("    %s\n", _("Optional port of which to connect"));
-  printf (" %s\n", "gf");
-  printf ("    %s\n", _("Field number in raw qstat output that contains game name"));
-  printf (" %s\n", "-mf");
-  printf ("    %s\n", _("Field number in raw qstat output that contains map name"));
-  printf (" %s\n", "-pf");
-  printf ("    %s\n", _("Field number in raw qstat output that contains ping time"));
+        printf(" %s\n", "-p");
+        printf("    %s\n", _("Optional port of which to connect"));
+        printf(" %s\n", "gf");
+        printf("    %s\n", _("Field number in raw qstat output that contains game name"));
+        printf(" %s\n", "-mf");
+        printf("    %s\n", _("Field number in raw qstat output that contains map name"));
+        printf(" %s\n", "-pf");
+        printf("    %s\n", _("Field number in raw qstat output that contains ping time"));
 
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool."));
-  printf (" %s\n", _("If you don't have the package installed, you will need to download it from"));
-  printf (" %s\n", _("https://github.com/multiplay/qstat before you can use this plugin."));
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool."));
+        printf(" %s\n", _("If you don't have the package installed, you will need to download it from"));
+        printf(" %s\n", _("https://github.com/multiplay/qstat before you can use this plugin."));
 
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s [-hvV] [-P port] [-t timeout] [-g game_field] [-m map_field] [-p ping_field] [-G game-time] [-H hostname] <game> <ip_address>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s [-hvV] [-P port] [-t timeout] [-g game_field] [-m map_field] [-p ping_field] [-G game-time] [-H hostname] <game> "
+                   "<ip_address>\n",
+                   progname);
 }
 
 /******************************************************************************
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index c34bb08..b39bccf 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_hpjd plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_hpjd plugin
-* 
-* This plugin tests the STATUS of an HP printer with a JetDirect card.
-* Net-SNMP must be installed on the computer running the plugin.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_hpjd plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_hpjd plugin
+ *
+ * This plugin tests the STATUS of an HP printer with a JetDirect card.
+ * Net-SNMP must be installed on the computer running the plugin.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_hpjd";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -39,9 +39,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include "netutils.h"
 
 #define DEFAULT_COMMUNITY "public"
-#define DEFAULT_PORT "161"
-
-const char *option_summary = "-H host [-C community]\n";
+#define DEFAULT_PORT      "161"
 
 #define HPJD_LINE_STATUS           ".1.3.6.1.4.1.11.2.3.9.1.1.2.1"
 #define HPJD_PAPER_STATUS          ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
@@ -56,22 +54,20 @@ const char *option_summary = "-H host [-C community]\n";
 #define HPJD_GD_PAPER_OUTPUT       ".1.3.6.1.4.1.11.2.3.9.1.1.2.19"
 #define HPJD_GD_STATUS_DISPLAY     ".1.3.6.1.4.1.11.2.3.9.1.1.3"
 
-#define ONLINE          0
-#define OFFLINE         1
+#define ONLINE  0
+#define OFFLINE 1
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static void print_help(void);
+void print_usage(void);
 
-char *community = NULL;
-char *address = NULL;
-unsigned int port = 0;
-int  check_paper_out = 1;
+static char *community = NULL;
+static char *address = NULL;
+static unsigned int port = 0;
+static int check_paper_out = 1;
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         char command_line[1024];
         int result = STATE_UNKNOWN;
         int line;
@@ -94,116 +90,99 @@ main (int argc, char **argv)
 
         errmsg = malloc(MAX_INPUT_BUFFER);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* removed ' 2>1' at end of command 10/27/1999 - EG */
         /* create the query string */
-        sprintf
-                (query_string,
-                 "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0",
-                 HPJD_LINE_STATUS,
-                 HPJD_PAPER_STATUS,
-                 HPJD_INTERVENTION_REQUIRED,
-                 HPJD_GD_PERIPHERAL_ERROR,
-                 HPJD_GD_PAPER_JAM,
-                 HPJD_GD_PAPER_OUT,
-                 HPJD_GD_TONER_LOW,
-                 HPJD_GD_PAGE_PUNT,
-                 HPJD_GD_MEMORY_OUT,
-                 HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
+        sprintf(query_string, "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0", HPJD_LINE_STATUS, HPJD_PAPER_STATUS,
+                        HPJD_INTERVENTION_REQUIRED, HPJD_GD_PERIPHERAL_ERROR, HPJD_GD_PAPER_JAM, HPJD_GD_PAPER_OUT, HPJD_GD_TONER_LOW,
+                        HPJD_GD_PAGE_PUNT, HPJD_GD_MEMORY_OUT, HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
 
         /* get the command to run */
-        sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s",
-                        PATH_TO_SNMPGET,
-                        community,
-                        address,
-                        port,
-                        query_string);
+        sprintf(command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s", PATH_TO_SNMPGET, community, address, port, query_string);
 
         /* run the command */
-        child_process = spopen (command_line);
+        child_process = spopen(command_line);
         if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), command_line);
+                printf(_("Could not open pipe: %s\n"), command_line);
                 return STATE_UNKNOWN;
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL) {
-                printf (_("Could not open stderr for %s\n"), command_line);
+                printf(_("Could not open stderr for %s\n"), command_line);
         }
 
         result = STATE_OK;
 
         line = 0;
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
 
                 /* strip the newline character from the end of the input */
-                if (input_buffer[strlen (input_buffer) - 1] == '\n')
-                        input_buffer[strlen (input_buffer) - 1] = 0;
+                if (input_buffer[strlen(input_buffer) - 1] == '\n')
+                        input_buffer[strlen(input_buffer) - 1] = 0;
 
                 line++;
 
-                temp_buffer = strtok (input_buffer, "=");
-                temp_buffer = strtok (NULL, "=");
+                temp_buffer = strtok(input_buffer, "=");
+                temp_buffer = strtok(NULL, "=");
 
                 if (temp_buffer == NULL && line < 13) {
 
-                                result = STATE_UNKNOWN;
-                                strcpy (errmsg, input_buffer);
+                        result = STATE_UNKNOWN;
+                        strcpy(errmsg, input_buffer);
 
                 } else {
 
                         switch (line) {
 
-                        case 1:                                                                         /* 1st line should contain the line status */
-                                line_status = atoi (temp_buffer);
+                        case 1: /* 1st line should contain the line status */
+                                line_status = atoi(temp_buffer);
                                 break;
-                        case 2:                                                                         /* 2nd line should contain the paper status */
-                                paper_status = atoi (temp_buffer);
+                        case 2: /* 2nd line should contain the paper status */
+                                paper_status = atoi(temp_buffer);
                                 break;
-                        case 3:                                                                         /* 3rd line should be intervention required */
-                                intervention_required = atoi (temp_buffer);
+                        case 3: /* 3rd line should be intervention required */
+                                intervention_required = atoi(temp_buffer);
                                 break;
-                        case 4:                                                                         /* 4th line should be peripheral error */
-                                peripheral_error = atoi (temp_buffer);
+                        case 4: /* 4th line should be peripheral error */
+                                peripheral_error = atoi(temp_buffer);
                                 break;
-                        case 5:                                                                         /* 5th line should contain the paper jam status */
-                                paper_jam = atoi (temp_buffer);
+                        case 5: /* 5th line should contain the paper jam status */
+                                paper_jam = atoi(temp_buffer);
                                 break;
-                        case 6:                                                                         /* 6th line should contain the paper out status */
-                                paper_out = atoi (temp_buffer);
+                        case 6: /* 6th line should contain the paper out status */
+                                paper_out = atoi(temp_buffer);
                                 break;
-                        case 7:                                                                         /* 7th line should contain the toner low status */
-                                toner_low = atoi (temp_buffer);
+                        case 7: /* 7th line should contain the toner low status */
+                                toner_low = atoi(temp_buffer);
                                 break;
-                        case 8:                                                                         /* did data come too slow for engine */
-                                page_punt = atoi (temp_buffer);
+                        case 8: /* did data come too slow for engine */
+                                page_punt = atoi(temp_buffer);
                                 break;
-                        case 9:                                                                         /* did we run out of memory */
-                                memory_out = atoi (temp_buffer);
+                        case 9: /* did we run out of memory */
+                                memory_out = atoi(temp_buffer);
                                 break;
-                        case 10:                                                                                /* is there a door open */
-                                door_open = atoi (temp_buffer);
+                        case 10: /* is there a door open */
+                                door_open = atoi(temp_buffer);
                                 break;
-                        case 11:                                                                                /* is output tray full */
-                                paper_output = atoi (temp_buffer);
+                        case 11: /* is output tray full */
+                                paper_output = atoi(temp_buffer);
                                 break;
-                        case 12:                                                                                /* display panel message */
-                                strcpy (display_message, temp_buffer + 1);
+                        case 12: /* display panel message */
+                                strcpy(display_message, temp_buffer + 1);
                                 break;
-                        default:                                                                                /* fold multiline message */
-                                strncat (display_message, input_buffer,
-                                                sizeof (display_message) - strlen (display_message) - 1);
+                        default: /* fold multiline message */
+                                strncat(display_message, input_buffer, sizeof(display_message) - strlen(display_message) - 1);
                         }
-
                 }
 
                 /* break out of the read loop if we encounter an error */
@@ -212,29 +191,27 @@ main (int argc, char **argv)
         }
 
         /* WARNING if output found on stderr */
-        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                result = max_state (result, STATE_WARNING);
+        if (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                result = max_state(result, STATE_WARNING);
                 /* remove CRLF */
-                if (input_buffer[strlen (input_buffer) - 1] == '\n')
-                        input_buffer[strlen (input_buffer) - 1] = 0;
-                sprintf (errmsg, "%s", input_buffer );
-
+                if (input_buffer[strlen(input_buffer) - 1] == '\n')
+                        input_buffer[strlen(input_buffer) - 1] = 0;
+                sprintf(errmsg, "%s", input_buffer);
         }
 
         /* close stderr */
-        (void) fclose (child_stderr);
+        (void)fclose(child_stderr);
 
         /* close the pipe */
-        if (spclose (child_process))
-                result = max_state (result, STATE_WARNING);
+        if (spclose(child_process))
+                result = max_state(result, STATE_WARNING);
 
         /* if there wasn't any output, display an error */
         if (line == 0) {
 
                 /* might not be the problem, but most likely is. */
-                result = STATE_UNKNOWN ;
-                xasprintf (&errmsg, "%s : Timeout from host %s\n", errmsg, address );
-
+                result = STATE_UNKNOWN;
+                xasprintf(&errmsg, "%s : Timeout from host %s\n", errmsg, address);
         }
 
         /* if we had no read errors, check the printer status results... */
@@ -242,201 +219,171 @@ main (int argc, char **argv)
 
                 if (paper_jam) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Paper Jam"));
-                }
-                else if (paper_out) {
+                        strcpy(errmsg, _("Paper Jam"));
+                } else if (paper_out) {
                         if (check_paper_out)
                                 result = STATE_WARNING;
-                        strcpy (errmsg, _("Out of Paper"));
-                }
-                else if (line_status == OFFLINE) {
-                        if (strcmp (errmsg, "POWERSAVE ON") != 0) {
+                        strcpy(errmsg, _("Out of Paper"));
+                } else if (line_status == OFFLINE) {
+                        if (strcmp(errmsg, "POWERSAVE ON") != 0) {
                                 result = STATE_WARNING;
-                                strcpy (errmsg, _("Printer Offline"));
+                                strcpy(errmsg, _("Printer Offline"));
                         }
-                }
-                else if (peripheral_error) {
+                } else if (peripheral_error) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Peripheral Error"));
-                }
-                else if (intervention_required) {
+                        strcpy(errmsg, _("Peripheral Error"));
+                } else if (intervention_required) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Intervention Required"));
-                }
-                else if (toner_low) {
+                        strcpy(errmsg, _("Intervention Required"));
+                } else if (toner_low) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Toner Low"));
-                }
-                else if (memory_out) {
+                        strcpy(errmsg, _("Toner Low"));
+                } else if (memory_out) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Insufficient Memory"));
-                }
-                else if (door_open) {
+                        strcpy(errmsg, _("Insufficient Memory"));
+                } else if (door_open) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("A Door is Open"));
-                }
-                else if (paper_output) {
+                        strcpy(errmsg, _("A Door is Open"));
+                } else if (paper_output) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Output Tray is Full"));
-                }
-                else if (page_punt) {
+                        strcpy(errmsg, _("Output Tray is Full"));
+                } else if (page_punt) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Data too Slow for Engine"));
-                }
-                else if (paper_status) {
+                        strcpy(errmsg, _("Data too Slow for Engine"));
+                } else if (paper_status) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Unknown Paper Error"));
+                        strcpy(errmsg, _("Unknown Paper Error"));
                 }
         }
 
         if (result == STATE_OK)
-                printf (_("Printer ok - (%s)\n"), display_message);
+                printf(_("Printer ok - (%s)\n"), display_message);
 
         else if (result == STATE_UNKNOWN) {
 
-                printf ("%s\n", errmsg);
+                printf("%s\n", errmsg);
 
                 /* if printer could not be reached, escalate to critical */
-                if (strstr (errmsg, "Timeout"))
+                if (strstr(errmsg, "Timeout"))
                         result = STATE_CRITICAL;
         }
 
         else if (result == STATE_WARNING)
-                printf ("%s (%s)\n", errmsg, display_message);
+                printf("%s (%s)\n", errmsg, display_message);
 
         return result;
 }
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
         int c;
 
         int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"community", required_argument, 0, 'C'},
-/*              {"critical",       required_argument,0,'c'}, */
-/*              {"warning",        required_argument,0,'w'}, */
-                {"port", required_argument,0,'p'}, 
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"community", required_argument, 0, 'C'},
+                                                                           /*           {"critical",       required_argument,0,'c'}, */
+                                                                           /*           {"warning",        required_argument,0,'w'}, */
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
-
         while (1) {
-                c = getopt_long (argc, argv, "+hVH:C:p:D", longopts, &option);
+                c = getopt_long(argc, argv, "+hVH:C:p:D", longopts, &option);
 
                 if (c == -1 || c == EOF || c == 1)
                         break;
 
                 switch (c) {
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
-                                address = strscpy(address, optarg) ;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
+                                address = strscpy(address, optarg);
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 'C':                                                                       /* community */
-                        community = strscpy (community, optarg);
+                case 'C': /* community */
+                        community = strscpy(community, optarg);
                         break;
                 case 'p':
                         if (!is_intpos(optarg))
-                                usage2 (_("Port must be a positive short integer"), optarg);
+                                usage2(_("Port must be a positive short integer"), optarg);
                         else
                                 port = atoi(optarg);
                         break;
-                case 'D':                                                                       /* disable paper out check*/
+                case 'D': /* disable paper out check*/
                         check_paper_out = 0;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
         c = optind;
         if (address == NULL) {
-                if (is_host (argv[c])) {
+                if (is_host(argv[c])) {
                         address = argv[c++];
-                }
-                else {
-                        usage2 (_("Invalid hostname/address"), argv[c]);
+                } else {
+                        usage2(_("Invalid hostname/address"), argv[c]);
                 }
         }
 
         if (community == NULL) {
-                if (argv[c] != NULL )
+                if (argv[c] != NULL)
                         community = argv[c];
                 else
-                        community = strdup (DEFAULT_COMMUNITY);
+                        community = strdup(DEFAULT_COMMUNITY);
         }
 
         if (port == 0) {
                 port = atoi(DEFAULT_PORT);
         }
 
-        return validate_arguments ();
-}
-
-
-int
-validate_arguments (void)
-{
-        return OK;
+        return validate_arguments();
 }
 
+int validate_arguments(void) { return OK; }
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin tests the STATUS of an HP printer with a JetDirect card."));
-        printf ("%s\n", _("Net-snmp must be installed on the computer running the plugin."));
+        printf("%s\n", _("This plugin tests the STATUS of an HP printer with a JetDirect card."));
+        printf("%s\n", _("Net-snmp must be installed on the computer running the plugin."));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (" %s\n", "-C, --community=STRING");
-        printf ("    %s", _("The SNMP community name "));
-        printf (_("(default=%s)"), DEFAULT_COMMUNITY);
-        printf ("\n");
-        printf (" %s\n", "-p, --port=STRING");
-        printf ("    %s", _("Specify the port to check "));
-        printf (_("(default=%s)"), DEFAULT_PORT);
-        printf ("\n");
-        printf (" %s\n", "-D");
-        printf ("    %s", _("Disable paper check "));
+        printf(" %s\n", "-C, --community=STRING");
+        printf("    %s", _("The SNMP community name "));
+        printf(_("(default=%s)"), DEFAULT_COMMUNITY);
+        printf("\n");
+        printf(" %s\n", "-p, --port=STRING");
+        printf("    %s", _("Specify the port to check "));
+        printf(_("(default=%s)"), DEFAULT_PORT);
+        printf("\n");
+        printf(" %s\n", "-D");
+        printf("    %s", _("Disable paper check "));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host [-C community] [-p port] [-D]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-C community] [-p port] [-D]\n", progname);
 }
diff --git a/plugins/check_http.c b/plugins/check_http.c
index cdf768c..97c0e39 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -3,7 +3,7 @@
 * Monitoring check_http plugin
 *
 * License: GPL
-* Copyright (c) 1999-2013 Monitoring Plugins Development Team
+* Copyright (c) 1999-2024 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -32,7 +32,7 @@
 *****************************************************************************/
 
 const char *progname = "check_http";
-const char *copyright = "1999-2022";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 // Do NOT sort those headers, it will break the build
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 3872e34..381dbd8 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -1,112 +1,105 @@
 /*****************************************************************************
-* 
-* Monitoring check_ide_smart plugin
-* ide-smart 1.3 - IDE S.M.A.R.T. checking tool
-* 
-* License: GPL
-* Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
-*               1998      Gadi Oxman <gadio@netvision.net.il>
-* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ide_smart plugin
-* 
-* This plugin checks a local hard drive with the (Linux specific) SMART
-* interface
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_ide_smart plugin
+ * ide-smart 1.3 - IDE S.M.A.R.T. checking tool
+ *
+ * License: GPL
+ * Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
+ *               1998      Gadi Oxman <gadio@netvision.net.il>
+ * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ide_smart plugin
+ *
+ * This plugin checks a local hard drive with the (Linux specific) SMART
+ * interface
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_ide_smart";
-const char *copyright = "1998-2007";
+const char *copyright = "1998-2024";
 const char *email = "devel@monitoring-plugins.org";
-        
+
 #include "common.h"
 #include "utils.h"
 
-void print_help (void);
-void print_usage (void);
+static void print_help(void);
+void print_usage(void);
 
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #ifdef __linux__
-#include <linux/hdreg.h>
-#include <linux/types.h>
+#       include <linux/hdreg.h>
+#       include <linux/types.h>
 
-#define OPEN_MODE O_RDONLY
+#       define OPEN_MODE O_RDONLY
 #endif /* __linux__ */
 #ifdef __NetBSD__
-#include <sys/device.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/videoio.h> /* for __u8 and friends */
-#include <sys/scsiio.h>
-#include <sys/ataio.h>
-#include <dev/ata/atareg.h>
-#include <dev/ic/wdcreg.h>
-
-#define SMART_ENABLE WDSM_ENABLE_OPS
-#define SMART_DISABLE WDSM_DISABLE_OPS
-#define SMART_IMMEDIATE_OFFLINE WDSM_EXEC_OFFL_IMM
-#define SMART_AUTO_OFFLINE 0xdb /* undefined in NetBSD headers */
-
-#define OPEN_MODE O_RDWR
+#       include <sys/device.h>
+#       include <sys/param.h>
+#       include <sys/sysctl.h>
+#       include <sys/videoio.h> /* for __u8 and friends */
+#       include <sys/scsiio.h>
+#       include <sys/ataio.h>
+#       include <dev/ata/atareg.h>
+#       include <dev/ic/wdcreg.h>
+
+#       define SMART_ENABLE            WDSM_ENABLE_OPS
+#       define SMART_DISABLE           WDSM_DISABLE_OPS
+#       define SMART_IMMEDIATE_OFFLINE WDSM_EXEC_OFFL_IMM
+#       define SMART_AUTO_OFFLINE      0xdb /* undefined in NetBSD headers */
+
+#       define OPEN_MODE O_RDWR
 #endif /* __NetBSD__ */
 #include <errno.h>
-        
-#define NR_ATTRIBUTES   30
-        
-#define PREFAILURE 2
-#define ADVISORY 1
+
+#define NR_ATTRIBUTES 30
+
+#define PREFAILURE  2
+#define ADVISORY    1
 #define OPERATIONAL 0
-#define UNKNOWN -1
+#define UNKNOWN     -1
 
-typedef struct threshold_s
-{
+typedef struct threshold_s {
         __u8 id;
         __u8 threshold;
         __u8 reserved[10];
-}
-__attribute__ ((packed)) threshold_t;
+} __attribute__((packed)) threshold_t;
 
-typedef struct thresholds_s
-{
+typedef struct thresholds_s {
         __u16 revision;
         threshold_t thresholds[NR_ATTRIBUTES];
         __u8 reserved[18];
         __u8 vendor[131];
         __u8 checksum;
-}
-__attribute__ ((packed)) thresholds_t;
+} __attribute__((packed)) thresholds_t;
 
-typedef struct value_s
-{
+typedef struct value_s {
         __u8 id;
         __u16 status;
         __u8 value;
         __u8 vendor[8];
-}
-__attribute__ ((packed)) value_t;
+} __attribute__((packed)) value_t;
 
-typedef struct values_s
-{
+typedef struct values_s {
         __u16 revision;
         value_t values[NR_ATTRIBUTES];
         __u8 offline_status;
@@ -118,90 +111,71 @@ typedef struct values_s
         __u8 reserved[16];
         __u8 vendor[125];
         __u8 checksum;
-}
-__attribute__ ((packed)) values_t;
+} __attribute__((packed)) values_t;
 
-struct
-{
+struct {
         __u8 value;
         char *text;
 }
 
-offline_status_text[] =
-        {
-                {0x00, "NeverStarted"},
-                {0x02, "Completed"},
-                {0x04, "Suspended"},
-                {0x05, "Aborted"},
-                {0x06, "Failed"},
-                {0, 0}
-        };
-
-struct
-{
+static offline_status_text[] = {{0x00, "NeverStarted"}, {0x02, "Completed"}, {0x04, "Suspended"},
+                                                                {0x05, "Aborted"},      {0x06, "Failed"},    {0, 0}};
+
+static struct {
         __u8 value;
         char *text;
-}
-
-smart_command[] =
-        {
-                {SMART_ENABLE, "SMART_ENABLE"},
-                {SMART_DISABLE, "SMART_DISABLE"},
-                {SMART_IMMEDIATE_OFFLINE, "SMART_IMMEDIATE_OFFLINE"},
-                {SMART_AUTO_OFFLINE, "SMART_AUTO_OFFLINE"}
-        };
-
-
-/* Index to smart_command table, keep in order */ 
-enum SmartCommand 
-        { SMART_CMD_ENABLE,
-                SMART_CMD_DISABLE,
-                SMART_CMD_IMMEDIATE_OFFLINE,
-                SMART_CMD_AUTO_OFFLINE 
-        };
-
-char *get_offline_text (int);
-int smart_read_values (int, values_t *);
-int nagios (values_t *, thresholds_t *);
-void print_value (value_t *, threshold_t *);
-void print_values (values_t *, thresholds_t *);
-int smart_cmd_simple (int, enum SmartCommand, __u8, bool);
-int smart_read_thresholds (int, thresholds_t *);
-bool verbose = false;
-
-int
-main (int argc, char *argv[]) 
-{
+} smart_command[] = {{SMART_ENABLE, "SMART_ENABLE"},
+                                         {SMART_DISABLE, "SMART_DISABLE"},
+                                         {SMART_IMMEDIATE_OFFLINE, "SMART_IMMEDIATE_OFFLINE"},
+                                         {SMART_AUTO_OFFLINE, "SMART_AUTO_OFFLINE"}};
+
+/* Index to smart_command table, keep in order */
+enum SmartCommand {
+        SMART_CMD_ENABLE,
+        SMART_CMD_DISABLE,
+        SMART_CMD_IMMEDIATE_OFFLINE,
+        SMART_CMD_AUTO_OFFLINE
+};
+
+static char *get_offline_text(int);
+static int smart_read_values(int, values_t *);
+static int nagios(values_t *, thresholds_t *);
+static void print_value(value_t *, threshold_t *);
+static void print_values(values_t *, thresholds_t *);
+static int smart_cmd_simple(int, enum SmartCommand, __u8, bool);
+static int smart_read_thresholds(int, thresholds_t *);
+static bool verbose = false;
+
+int main(int argc, char *argv[]) {
         char *device = NULL;
-        int o, longindex;
+        int o;
+        int longindex;
         int retval = 0;
 
         thresholds_t thresholds;
         values_t values;
         int fd;
 
-        static struct option longopts[] = { 
-                {"device", required_argument, 0, 'd'}, 
-                {"immediate", no_argument, 0, 'i'}, 
-                {"quiet-check", no_argument, 0, 'q'}, 
-                {"auto-on", no_argument, 0, '1'}, 
-                {"auto-off", no_argument, 0, '0'}, 
-                {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */
-                {"help", no_argument, 0, 'h'}, 
-                {"version", no_argument, 0, 'V'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {{"device", required_argument, 0, 'd'},
+                                                                           {"immediate", no_argument, 0, 'i'},
+                                                                           {"quiet-check", no_argument, 0, 'q'},
+                                                                           {"auto-on", no_argument, 0, '1'},
+                                                                           {"auto-off", no_argument, 0, '0'},
+                                                                           {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {0, 0, 0, 0}};
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         while (true) {
-                
-                o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex);
+
+                o = getopt_long(argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
                 if (o == -1 || o == EOF || o == 1)
                         break;
@@ -211,30 +185,30 @@ main (int argc, char *argv[])
                         device = optarg;
                         break;
                 case 'q':
-                        fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."));
-                        fprintf (stderr, "%s\n", _("Nagios-compatible output is now always returned."));
+                        fprintf(stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."));
+                        fprintf(stderr, "%s\n", _("Nagios-compatible output is now always returned."));
                         break;
                 case 'i':
                 case '1':
                 case '0':
-                        printf ("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help)."));
+                        printf("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help)."));
                         return STATE_CRITICAL;
                         break;
                 case 'n':
-                        fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"));
-                        fprintf (stderr, "%s\n", _("default and will be removed from future releases."));
+                        fprintf(stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"));
+                        fprintf(stderr, "%s\n", _("default and will be removed from future releases."));
                         break;
                 case 'v': /* verbose */
                         verbose = true;
                         break;
                 case 'h':
-                        print_help ();
+                        print_help();
                         return STATE_UNKNOWN;
                 case 'V':
-                        print_revision (progname, NP_VERSION);
+                        print_revision(progname, NP_VERSION);
                         return STATE_UNKNOWN;
                 default:
-                        usage5 ();
+                        usage5();
                 }
         }
 
@@ -243,36 +217,33 @@ main (int argc, char *argv[])
         }
 
         if (!device) {
-                print_help ();
+                print_help();
                 return STATE_UNKNOWN;
         }
 
-        fd = open (device, OPEN_MODE);
+        fd = open(device, OPEN_MODE);
 
         if (fd < 0) {
-                printf (_("CRITICAL - Couldn't open device %s: %s\n"), device, strerror (errno));
+                printf(_("CRITICAL - Couldn't open device %s: %s\n"), device, strerror(errno));
                 return STATE_CRITICAL;
         }
 
-        if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, false)) {
-                printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
+        if (smart_cmd_simple(fd, SMART_CMD_ENABLE, 0, false)) {
+                printf(_("CRITICAL - SMART_CMD_ENABLE\n"));
                 return STATE_CRITICAL;
         }
 
-        smart_read_values (fd, &values);
-        smart_read_thresholds (fd, &thresholds);
-        retval = nagios (&values, &thresholds);
-        if (verbose) print_values (&values, &thresholds);
+        smart_read_values(fd, &values);
+        smart_read_thresholds(fd, &thresholds);
+        retval = nagios(&values, &thresholds);
+        if (verbose)
+                print_values(&values, &thresholds);
 
-        close (fd);
+        close(fd);
         return retval;
 }
 
-
-
-char *
-get_offline_text (int status) 
-{
+char *get_offline_text(int status) {
         int i;
         for (i = 0; offline_status_text[i].text; i++) {
                 if (offline_status_text[i].value == status) {
@@ -282,11 +253,7 @@ get_offline_text (int status)
         return "UNKNOWN";
 }
 
-
-
-int
-smart_read_values (int fd, values_t * values) 
-{
+int smart_read_values(int fd, values_t *values) {
 #ifdef __linux__
         int e;
         __u8 args[4 + 512];
@@ -294,12 +261,12 @@ smart_read_values (int fd, values_t * values)
         args[1] = 0;
         args[2] = SMART_READ_VALUES;
         args[3] = 1;
-        if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
+        if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = errno;
-                printf (_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror(errno));
                 return e;
         }
-        memcpy (values, args + 4, 512);
+        memcpy(values, args + 4, 512);
 #endif /* __linux__ */
 #ifdef __NetBSD__
         struct atareq req;
@@ -323,7 +290,7 @@ smart_read_values (int fd, values_t * values)
 
         if (errno != 0) {
                 int e = errno;
-                printf (_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror(errno));
                 return e;
         }
 
@@ -332,13 +299,9 @@ smart_read_values (int fd, values_t * values)
         return 0;
 }
 
-
-
-int
-nagios (values_t * p, thresholds_t * t) 
-{
-        value_t * value = p->values;
-        threshold_t * threshold = t->thresholds;
+int nagios(values_t *p, thresholds_t *t) {
+        value_t *value = p->values;
+        threshold_t *threshold = t->thresholds;
         int status = OPERATIONAL;
         int prefailure = 0;
         int advisory = 0;
@@ -353,13 +316,11 @@ nagios (values_t * p, thresholds_t * t)
                                 if (value->status & 1) {
                                         status = PREFAILURE;
                                         ++prefailure;
-                                }
-                                else {
+                                } else {
                                         status = ADVISORY;
                                         ++advisory;
                                 }
-                        }
-                        else {
+                        } else {
                                 ++passed;
                         }
                         ++total;
@@ -369,81 +330,49 @@ nagios (values_t * p, thresholds_t * t)
         }
         switch (status) {
         case PREFAILURE:
-                printf (_("CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"),
-                        prefailure,
-                        prefailure > 1 ? 's' : ' ',
-                        failed,
-                  total);
-                status=STATE_CRITICAL;
+                printf(_("CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"), prefailure, prefailure > 1 ? 's' : ' ', failed,
+                           total);
+                status = STATE_CRITICAL;
                 break;
         case ADVISORY:
-                printf (_("WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"),
-                        advisory,
-                        advisory > 1 ? "ies" : "y",
-                        failed,
-                        total);
-                status=STATE_WARNING;
+                printf(_("WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"), advisory, advisory > 1 ? "ies" : "y", failed, total);
+                status = STATE_WARNING;
                 break;
         case OPERATIONAL:
-                printf (_("OK - Operational (%d/%d tests passed)\n"), passed, total);
-                status=STATE_OK;
+                printf(_("OK - Operational (%d/%d tests passed)\n"), passed, total);
+                status = STATE_OK;
                 break;
         default:
-                printf (_("ERROR - Status '%d' unknown. %d/%d tests passed\n"), status,
-                                                passed, total);
+                printf(_("ERROR - Status '%d' unknown. %d/%d tests passed\n"), status, passed, total);
                 status = STATE_UNKNOWN;
                 break;
         }
         return status;
 }
 
-
-
-void
-print_value (value_t * p, threshold_t * t) 
-{
-        printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
-                                        p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
-                                        p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
-                                        p->value >= t->threshold ? "Passed" : "Failed");
+void print_value(value_t *p, threshold_t *t) {
+        printf("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n", p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
+                   p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold, p->value >= t->threshold ? "Passed" : "Failed");
 }
 
-
-
-void
-print_values (values_t * p, thresholds_t * t)
-{
-        value_t * value = p->values;
-        threshold_t * threshold = t->thresholds;
+void print_values(values_t *p, thresholds_t *t) {
+        value_t *value = p->values;
+        threshold_t *threshold = t->thresholds;
         int i;
         for (i = 0; i < NR_ATTRIBUTES; i++) {
                 if (value->id && threshold->id && value->id == threshold->id) {
-                        print_value (value++, threshold++);
+                        print_value(value++, threshold++);
                 }
         }
-        printf
-                (_("OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"),
-                 p->offline_status,
-                 get_offline_text (p->offline_status & 0x7f),
-                 (p->offline_status & 0x80 ? "Yes" : "No"),
-                 p->offline_timeout / 60);
-        printf
-                (_("OffLineCapability=%d {%s %s %s}\n"),
-                 p->offline_capability,
-                 p->offline_capability & 1 ? "Immediate" : "",
-                 p->offline_capability & 2 ? "Auto" : "",
-                 p->offline_capability & 4 ? "AbortOnCmd" : "SuspendOnCmd");
-        printf
-                (_("SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"),
-                 p->revision,
-                 p->checksum,
-                 p->smart_capability,
-                 p->smart_capability & 1 ? "SaveOnStandBy" : "",
-                 p->smart_capability & 2 ? "AutoSave" : "");
+        printf(_("OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"), p->offline_status,
+                   get_offline_text(p->offline_status & 0x7f), (p->offline_status & 0x80 ? "Yes" : "No"), p->offline_timeout / 60);
+        printf(_("OffLineCapability=%d {%s %s %s}\n"), p->offline_capability, p->offline_capability & 1 ? "Immediate" : "",
+                   p->offline_capability & 2 ? "Auto" : "", p->offline_capability & 4 ? "AbortOnCmd" : "SuspendOnCmd");
+        printf(_("SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"), p->revision, p->checksum, p->smart_capability,
+                   p->smart_capability & 1 ? "SaveOnStandBy" : "", p->smart_capability & 2 ? "AutoSave" : "");
 }
 
-
-int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, bool show_error) {
+int smart_cmd_simple(int fd, enum SmartCommand command, __u8 val0, bool show_error) {
         int e = STATE_UNKNOWN;
 #ifdef __linux__
         __u8 args[4];
@@ -451,14 +380,14 @@ int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, bool show_er
         args[1] = val0;
         args[2] = smart_command[command].value;
         args[3] = 0;
-        if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
+        if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = STATE_CRITICAL;
                 if (show_error)
-                        printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
+                        printf(_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror(errno));
         } else {
                 e = STATE_OK;
                 if (show_error)
-                        printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
+                        printf(_("OK - Command sent (%s)\n"), smart_command[command].text);
         }
 
 #endif /* __linux__ */
@@ -483,35 +412,31 @@ int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, bool show_er
         if (errno != 0) {
                 e = STATE_CRITICAL;
                 if (show_error)
-                        printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
+                        printf(_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror(errno));
         } else {
                 e = STATE_OK;
                 if (show_error)
-                        printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
+                        printf(_("OK - Command sent (%s)\n"), smart_command[command].text);
         }
 
 #endif /* __NetBSD__ */
         return e;
 }
 
-
-
-int
-smart_read_thresholds (int fd, thresholds_t * thresholds) 
-{
+int smart_read_thresholds(int fd, thresholds_t *thresholds) {
 #ifdef __linux__
         int e;
         __u8 args[4 + 512];
         args[0] = WIN_SMART;
-  args[1] = 0;
-  args[2] = SMART_READ_THRESHOLDS;
-  args[3] = 1;
-        if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
+        args[1] = 0;
+        args[2] = SMART_READ_THRESHOLDS;
+        args[3] = 1;
+        if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = errno;
-                printf (_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror(errno));
                 return e;
         }
-        memcpy (thresholds, args + 4, 512);
+        memcpy(thresholds, args + 4, 512);
 #endif /* __linux__ */
 #ifdef __NetBSD__
         struct atareq req;
@@ -535,7 +460,7 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
 
         if (errno != 0) {
                 int e = errno;
-                printf (_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror(errno));
                 return e;
         }
 
@@ -544,45 +469,43 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
         return 0;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+        printf("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
+        printf("Plugin implementation - 1999 Robert Dale <rdale@digital-mission.com>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
-        printf ("Plugin implementation - 1999 Robert Dale <rdale@digital-mission.com>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf(_("This plugin checks a local hard drive with the (Linux specific) SMART interface "
+                         "[http://smartlinux.sourceforge.net/smart/index.php]."));
 
-        printf (_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php]."));
+        printf("\n\n");
 
-  printf ("\n\n");
+        print_usage();
 
-  print_usage ();
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
+        printf(" %s\n", "-d, --device=DEVICE");
+        printf("    %s\n", _("Select device DEVICE"));
+        printf("    %s\n", _("Note: if the device is specified without this option, any further option will"));
+        printf("          %s\n", _("be ignored."));
 
-  printf (" %s\n", "-d, --device=DEVICE");
-  printf ("    %s\n", _("Select device DEVICE"));
-  printf ("    %s\n", _("Note: if the device is specified without this option, any further option will"));
-  printf ("          %s\n", _("be ignored."));
+        printf(UT_VERBOSE);
 
-  printf (UT_VERBOSE);
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"));
+        printf(" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl"));
+        printf(" %s\n", _("instead:"));
+        printf("  %s\n", _("-0/--auto-off:  use \"smartctl --offlineauto=off\""));
+        printf("  %s\n", _("-1/--auto-on:   use \"smartctl --offlineauto=on\""));
+        printf("  %s\n", _("-i/--immediate: use \"smartctl --test=offline\""));
 
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"));
-  printf (" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl"));
-  printf (" %s\n", _("instead:"));
-  printf ("  %s\n", _("-0/--auto-off:  use \"smartctl --offlineauto=off\""));
-  printf ("  %s\n", _("-1/--auto-on:   use \"smartctl --offlineauto=on\""));
-  printf ("  %s\n", _("-i/--immediate: use \"smartctl --test=offline\""));
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
- /* todo : add to the long nanual as example
+/* todo : add to the long nanual as example
  *
  *     Run with:  check_ide-smart --nagios [-d] <DRIVE>
  *     Where DRIVE is an IDE drive, ie. /dev/hda, /dev/hdb, /dev/hdc
@@ -593,10 +516,7 @@ print_help (void)
  *       - Returns -1 not too often
  */
 
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf ("%s [-d <device>] [-v]", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-d <device>] [-v]", progname);
 }
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 868ffc1..1c72829 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -3,7 +3,7 @@
 * Monitoring check_ldap plugin
 *
 * License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
+* Copyright (c) 2000-2024 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -28,7 +28,7 @@
 
 /* progname may be check_ldaps */
 char *progname = "check_ldap";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 826b77e..632e66f 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -1,88 +1,79 @@
 /*****************************************************************************
-* 
-* Monitoring check_mrtg plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_mrtg plugin
-* 
-* This plugin will check either the average or maximum value of one of the
-* two variables recorded in an MRTG log file.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_mrtg plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_mrtg plugin
+ *
+ * This plugin will check either the average or maximum value of one of the
+ * two variables recorded in an MRTG log file.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_mrtg";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-char *log_file = NULL;
-int expire_minutes = 0;
-bool use_average = true;
-int variable_number = -1;
-unsigned long value_warning_threshold = 0L;
-unsigned long value_critical_threshold = 0L;
-char *label;
-char *units;
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_OK;
-        FILE *fp;
-        int line;
-        char input_buffer[MAX_INPUT_BUFFER];
-        char *temp_buffer;
-        time_t current_time;
-        time_t timestamp = 0L;
-        unsigned long average_value_rate = 0L;
-        unsigned long maximum_value_rate = 0L;
-        unsigned long rate = 0L;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static void print_help(void);
+void print_usage(void);
+
+static char *log_file = NULL;
+static int expire_minutes = 0;
+static bool use_average = true;
+static int variable_number = -1;
+static unsigned long value_warning_threshold = 0L;
+static unsigned long value_critical_threshold = 0L;
+static char *label;
+static char *units;
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments\n"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments\n"));
 
         /* open the MRTG log file for reading */
-        fp = fopen (log_file, "r");
-        if (fp == NULL) {
-                printf (_("Unable to open MRTG log file\n"));
+        FILE *mtrg_log_file = fopen(log_file, "r");
+        if (mtrg_log_file == NULL) {
+                printf(_("Unable to open MRTG log file\n"));
                 return STATE_UNKNOWN;
         }
 
-        line = 0;
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+        time_t timestamp = 0L;
+        unsigned long average_value_rate = 0L;
+        unsigned long maximum_value_rate = 0L;
+        char input_buffer[MAX_INPUT_BUFFER];
+        int line = 0;
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, mtrg_log_file)) {
 
                 line++;
 
@@ -95,291 +86,260 @@ main (int argc, char **argv)
                         break;
 
                 /* grab the timestamp */
-                temp_buffer = strtok (input_buffer, " ");
-                timestamp = strtoul (temp_buffer, NULL, 10);
+                char *temp_buffer = strtok(input_buffer, " ");
+                timestamp = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average value 1 rate */
-                temp_buffer = strtok (NULL, " ");
+                temp_buffer = strtok(NULL, " ");
                 if (variable_number == 1)
-                        average_value_rate = strtoul (temp_buffer, NULL, 10);
+                        average_value_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average value 2 rate */
-                temp_buffer = strtok (NULL, " ");
+                temp_buffer = strtok(NULL, " ");
                 if (variable_number == 2)
-                        average_value_rate = strtoul (temp_buffer, NULL, 10);
+                        average_value_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the maximum value 1 rate */
-                temp_buffer = strtok (NULL, " ");
+                temp_buffer = strtok(NULL, " ");
                 if (variable_number == 1)
-                        maximum_value_rate = strtoul (temp_buffer, NULL, 10);
+                        maximum_value_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the maximum value 2 rate */
-                temp_buffer = strtok (NULL, " ");
+                temp_buffer = strtok(NULL, " ");
                 if (variable_number == 2)
-                        maximum_value_rate = strtoul (temp_buffer, NULL, 10);
+                        maximum_value_rate = strtoul(temp_buffer, NULL, 10);
         }
 
         /* close the log file */
-        fclose (fp);
+        fclose(mtrg_log_file);
 
         /* if we couldn't read enough data, return an unknown error */
         if (line <= 2) {
-                printf (_("Unable to process MRTG log file\n"));
+                printf(_("Unable to process MRTG log file\n"));
                 return STATE_UNKNOWN;
         }
 
         /* make sure the MRTG data isn't too old */
-        time (&current_time);
-        if (expire_minutes > 0
-                        && (current_time - timestamp) > (expire_minutes * 60)) {
-                printf (_("MRTG data has expired (%d minutes old)\n"),
-                        (int) ((current_time - timestamp) / 60));
+        time_t current_time;
+        time(&current_time);
+        if (expire_minutes > 0 && (current_time - timestamp) > (expire_minutes * 60)) {
+                printf(_("MRTG data has expired (%d minutes old)\n"), (int)((current_time - timestamp) / 60));
                 return STATE_WARNING;
         }
 
+        unsigned long rate = 0L;
         /* else check the incoming/outgoing rates */
         if (use_average)
                 rate = average_value_rate;
         else
                 rate = maximum_value_rate;
 
+        int result = STATE_OK;
         if (rate > value_critical_threshold)
                 result = STATE_CRITICAL;
         else if (rate > value_warning_threshold)
                 result = STATE_WARNING;
 
-        printf("%s. %s = %lu %s|%s\n",
-               (use_average) ? _("Avg") : _("Max"),
-               label, rate, units,
-               perfdata(label, (long) rate, units,
-                        (int) value_warning_threshold, (long) value_warning_threshold,
-                        (int) value_critical_threshold, (long) value_critical_threshold,
-                        0, 0, 0, 0));
+        printf("%s. %s = %lu %s|%s\n", (use_average) ? _("Avg") : _("Max"), label, rate, units,
+                   perfdata(label, (long)rate, units, (int)value_warning_threshold, (long)value_warning_threshold, (int)value_critical_threshold,
+                                        (long)value_critical_threshold, 0, 0, 0, 0));
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
+int process_arguments(int argc, char **argv) {
         static struct option longopts[] = {
-                {"logfile", required_argument, 0, 'F'},
-                {"expires", required_argument, 0, 'e'},
-                {"aggregation", required_argument, 0, 'a'},
-                {"variable", required_argument, 0, 'v'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"label", required_argument, 0, 'l'},
-                {"units", required_argument, 0, 'u'},
-                {"variable", required_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+                {"logfile", required_argument, 0, 'F'},  {"expires", required_argument, 0, 'e'},  {"aggregation", required_argument, 0, 'a'},
+                {"variable", required_argument, 0, 'v'}, {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},
+                {"label", required_argument, 0, 'l'},    {"units", required_argument, 0, 'u'},    {"variable", required_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0)
+                        strcpy(argv[i], "-t");
+                else if (strcmp("-wt", argv[i]) == 0)
+                        strcpy(argv[i], "-w");
+                else if (strcmp("-ct", argv[i]) == 0)
+                        strcpy(argv[i], "-c");
         }
 
+        int option_char;
+        int option = 0;
         while (1) {
-                c = getopt_long (argc, argv, "hVF:e:a:v:c:w:l:u:", longopts,
-                                                                         &option);
+                option_char = getopt_long(argc, argv, "hVF:e:a:v:c:w:l:u:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case 'F':                                                                       /* input file */
+                switch (option_char) {
+                case 'F': /* input file */
                         log_file = optarg;
                         break;
-                case 'e':                                                                       /* ups name */
-                        expire_minutes = atoi (optarg);
+                case 'e': /* ups name */
+                        expire_minutes = atoi(optarg);
                         break;
-                case 'a':                                                                       /* port */
-                        if (!strcmp (optarg, "MAX"))
+                case 'a': /* port */
+                        if (!strcmp(optarg, "MAX"))
                                 use_average = false;
                         else
                                 use_average = true;
                         break;
                 case 'v':
-                        variable_number = atoi (optarg);
+                        variable_number = atoi(optarg);
                         if (variable_number < 1 || variable_number > 2)
-                                usage4 (_("Invalid variable number"));
+                                usage4(_("Invalid variable number"));
                         break;
-                case 'w':                                                                       /* critical time threshold */
-                        value_warning_threshold = strtoul (optarg, NULL, 10);
+                case 'w': /* critical time threshold */
+                        value_warning_threshold = strtoul(optarg, NULL, 10);
                         break;
-                case 'c':                                                                       /* warning time threshold */
-                        value_critical_threshold = strtoul (optarg, NULL, 10);
+                case 'c': /* warning time threshold */
+                        value_critical_threshold = strtoul(optarg, NULL, 10);
                         break;
-                case 'l':                                                                       /* label */
+                case 'l': /* label */
                         label = optarg;
                         break;
-                case 'u':                                                                       /* timeout */
+                case 'u': /* timeout */
                         units = optarg;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (log_file == NULL && argc > c) {
-                log_file = argv[c++];
+        option_char = optind;
+        if (log_file == NULL && argc > option_char) {
+                log_file = argv[option_char++];
         }
 
-        if (expire_minutes <= 0 && argc > c) {
-                if (is_intpos (argv[c]))
-                        expire_minutes = atoi (argv[c++]);
+        if (expire_minutes <= 0 && argc > option_char) {
+                if (is_intpos(argv[option_char]))
+                        expire_minutes = atoi(argv[option_char++]);
                 else
-                        die (STATE_UNKNOWN,
-                                   _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"),
-                                   argv[c], progname);
+                        die(STATE_UNKNOWN, _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"), argv[option_char], progname);
         }
 
-        if (argc > c && strcmp (argv[c], "MAX") == 0) {
+        if (argc > option_char && strcmp(argv[option_char], "MAX") == 0) {
                 use_average = false;
-                c++;
-        }
-        else if (argc > c && strcmp (argv[c], "AVG") == 0) {
+                option_char++;
+        } else if (argc > option_char && strcmp(argv[option_char], "AVG") == 0) {
                 use_average = true;
-                c++;
+                option_char++;
         }
 
-        if (argc > c && variable_number == -1) {
-                variable_number = atoi (argv[c++]);
+        if (argc > option_char && variable_number == -1) {
+                variable_number = atoi(argv[option_char++]);
                 if (variable_number < 1 || variable_number > 2) {
-                        printf ("%s :", argv[c]);
-                        usage (_("Invalid variable number\n"));
+                        printf("%s :", argv[option_char]);
+                        usage(_("Invalid variable number\n"));
                 }
         }
 
-        if (argc > c && value_warning_threshold == 0) {
-                value_warning_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && value_warning_threshold == 0) {
+                value_warning_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        if (argc > c && value_critical_threshold == 0) {
-                value_critical_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && value_critical_threshold == 0) {
+                value_critical_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        if (argc > c && strlen (label) == 0) {
-                label = argv[c++];
+        if (argc > option_char && strlen(label) == 0) {
+                label = argv[option_char++];
         }
 
-        if (argc > c && strlen (units) == 0) {
-                units = argv[c++];
+        if (argc > option_char && strlen(units) == 0) {
+                units = argv[option_char++];
         }
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-int
-validate_arguments (void)
-{
+int validate_arguments(void) {
         if (variable_number == -1)
-                usage4 (_("You must supply the variable number"));
+                usage4(_("You must supply the variable number"));
 
         if (label == NULL)
-                label = strdup ("value");
+                label = strdup("value");
 
         if (units == NULL)
-                units = strdup ("");
+                units = strdup("");
 
         return OK;
 }
 
-
-
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf ("%s\n", _("This plugin will check either the average or maximum value of one of the"));
-  printf ("%s\n", _("two variables recorded in an MRTG log file."));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (" %s\n", "-F, --logfile=FILE");
-  printf ("   %s\n", _("The MRTG log file containing the data you want to monitor"));
-  printf (" %s\n", "-e, --expires=MINUTES");
-  printf ("   %s\n", _("Minutes before MRTG data is considered to be too old"));
-  printf (" %s\n", "-a, --aggregation=AVG|MAX");
-  printf ("   %s\n", _("Should we check average or maximum values?"));
-  printf (" %s\n", "-v, --variable=INTEGER");
-  printf ("   %s\n", _("Which variable set should we inspect? (1 or 2)"));
-  printf (" %s\n", "-w, --warning=INTEGER");
-  printf ("   %s\n", _("Threshold value for data to result in WARNING status"));
-  printf (" %s\n", "-c, --critical=INTEGER");
-  printf ("   %s\n", _("Threshold value for data to result in CRITICAL status"));
-        printf (" %s\n", "-l, --label=STRING");
-  printf ("   %s\n", _("Type label for data (Examples: Conns, \"Processor Load\", In, Out)"));
-  printf (" %s\n", "-u, --units=STRING");
-  printf ("   %s\n", _("Option units label for data (Example: Packets/Sec, Errors/Sec,"));
-  printf ("   %s\n", _("\"Bytes Per Second\", \"%% Utilization\")"));
-
-  printf ("\n");
-        printf (" %s\n", _("If the value exceeds the <vwl> threshold, a WARNING status is returned. If"));
-  printf (" %s\n", _("the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If"));
-  printf (" %s\n", _("the data in the log file is older than <expire_minutes> old, a WARNING"));
-  printf (" %s\n", _("status is returned and a warning message is printed."));
-
-  printf ("\n");
-        printf (" %s\n", _("This plugin is useful for monitoring MRTG data that does not correspond to"));
-  printf (" %s\n", _("bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."));
-  printf (" %s\n", _("It can be used to monitor any kind of data that MRTG is monitoring - errors,"));
-  printf (" %s\n", _("packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"));
-  printf (" %s\n", _("me to track processor utilization, user connections, drive space, etc and"));
-  printf (" %s\n\n", _("this plugin works well for monitoring that kind of data as well."));
-
-        printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("- This plugin only monitors one of the two variables stored in the MRTG log"));
-  printf ("   %s\n", _("file.  If you want to monitor both values you will have to define two"));
-  printf ("   %s\n", _("commands with different values for the <variable> argument.  Of course,"));
-  printf ("   %s\n", _("you can always hack the code to make this plugin work for you..."));
-  printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
-  printf ("   %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
-
-        printf (UT_SUPPORT);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf("%s\n", _("This plugin will check either the average or maximum value of one of the"));
+        printf("%s\n", _("two variables recorded in an MRTG log file."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-F, --logfile=FILE");
+        printf("   %s\n", _("The MRTG log file containing the data you want to monitor"));
+        printf(" %s\n", "-e, --expires=MINUTES");
+        printf("   %s\n", _("Minutes before MRTG data is considered to be too old"));
+        printf(" %s\n", "-a, --aggregation=AVG|MAX");
+        printf("   %s\n", _("Should we check average or maximum values?"));
+        printf(" %s\n", "-v, --variable=INTEGER");
+        printf("   %s\n", _("Which variable set should we inspect? (1 or 2)"));
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("   %s\n", _("Threshold value for data to result in WARNING status"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("   %s\n", _("Threshold value for data to result in CRITICAL status"));
+        printf(" %s\n", "-l, --label=STRING");
+        printf("   %s\n", _("Type label for data (Examples: Conns, \"Processor Load\", In, Out)"));
+        printf(" %s\n", "-u, --units=STRING");
+        printf("   %s\n", _("Option units label for data (Example: Packets/Sec, Errors/Sec,"));
+        printf("   %s\n", _("\"Bytes Per Second\", \"%% Utilization\")"));
+
+        printf("\n");
+        printf(" %s\n", _("If the value exceeds the <vwl> threshold, a WARNING status is returned. If"));
+        printf(" %s\n", _("the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If"));
+        printf(" %s\n", _("the data in the log file is older than <expire_minutes> old, a WARNING"));
+        printf(" %s\n", _("status is returned and a warning message is printed."));
+
+        printf("\n");
+        printf(" %s\n", _("This plugin is useful for monitoring MRTG data that does not correspond to"));
+        printf(" %s\n", _("bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."));
+        printf(" %s\n", _("It can be used to monitor any kind of data that MRTG is monitoring - errors,"));
+        printf(" %s\n", _("packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"));
+        printf(" %s\n", _("me to track processor utilization, user connections, drive space, etc and"));
+        printf(" %s\n\n", _("this plugin works well for monitoring that kind of data as well."));
+
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("- This plugin only monitors one of the two variables stored in the MRTG log"));
+        printf("   %s\n", _("file.  If you want to monitor both values you will have to define two"));
+        printf("   %s\n", _("commands with different values for the <variable> argument.  Of course,"));
+        printf("   %s\n", _("you can always hack the code to make this plugin work for you..."));
+        printf(" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
+        printf("   %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
+
+        printf(UT_SUPPORT);
 }
 
-
-
 /* original command line:
          <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n",progname);
-  printf ("[-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n", progname);
+        printf("[-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n");
 }
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index bd25d47..e5a2e2a 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -1,94 +1,77 @@
 /*****************************************************************************
-* 
-* Monitoring check_mrtgtraf plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_mtrgtraf plugin
-* 
-* This plugin will check the incoming/outgoing transfer rates of a router
-* switch, etc recorded in an MRTG log.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_mrtgtraf plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_mtrgtraf plugin
+ *
+ * This plugin will check the incoming/outgoing transfer rates of a router
+ * switch, etc recorded in an MRTG log.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils.h"
 
 const char *progname = "check_mrtgtraf";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help(void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
 void print_usage(void);
 
-char *log_file = NULL;
-int expire_minutes = -1;
-bool use_average = true;
-unsigned long incoming_warning_threshold = 0L;
-unsigned long incoming_critical_threshold = 0L;
-unsigned long outgoing_warning_threshold = 0L;
-unsigned long outgoing_critical_threshold = 0L;
+static char *log_file = NULL;
+static int expire_minutes = -1;
+static bool use_average = true;
+static unsigned long incoming_warning_threshold = 0L;
+static unsigned long incoming_critical_threshold = 0L;
+static unsigned long outgoing_warning_threshold = 0L;
+static unsigned long outgoing_critical_threshold = 0L;
 
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_OK;
-        FILE *fp;
-        int line;
-        char input_buffer[MAX_INPUT_BUFFER];
-        char *temp_buffer;
-        time_t current_time;
-        char *error_message;
-        time_t timestamp = 0L;
-        unsigned long average_incoming_rate = 0L;
-        unsigned long average_outgoing_rate = 0L;
-        unsigned long maximum_incoming_rate = 0L;
-        unsigned long maximum_outgoing_rate = 0L;
-        unsigned long incoming_rate = 0L;
-        unsigned long outgoing_rate = 0L;
-        double adjusted_incoming_rate = 0.0;
-        double adjusted_outgoing_rate = 0.0;
-        char incoming_speed_rating[8];
-        char outgoing_speed_rating[8];
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* open the MRTG log file for reading */
-        fp = fopen (log_file, "r");
-        if (fp == NULL)
-                usage4 (_("Unable to open MRTG log file"));
+        FILE *mrtg_log_file_ptr = fopen(log_file, "r");
+        if (mrtg_log_file_ptr == NULL)
+                usage4(_("Unable to open MRTG log file"));
 
-        line = 0;
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+        time_t timestamp = 0L;
+        char input_buffer[MAX_INPUT_BUFFER];
+        unsigned long average_incoming_rate = 0L;
+        unsigned long average_outgoing_rate = 0L;
+        unsigned long maximum_incoming_rate = 0L;
+        unsigned long maximum_outgoing_rate = 0L;
+        int line = 0;
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, mrtg_log_file_ptr)) {
 
                 line++;
 
@@ -102,280 +85,254 @@ main (int argc, char **argv)
                         break;
 
                 /* grab the timestamp */
-                temp_buffer = strtok (input_buffer, " ");
-                timestamp = strtoul (temp_buffer, NULL, 10);
+                char *temp_buffer = strtok(input_buffer, " ");
+                timestamp = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average incoming transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                average_incoming_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                average_incoming_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average outgoing transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                average_outgoing_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                average_outgoing_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the maximum incoming transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                maximum_incoming_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                maximum_incoming_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the maximum outgoing transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                maximum_outgoing_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                maximum_outgoing_rate = strtoul(temp_buffer, NULL, 10);
         }
 
         /* close the log file */
-        fclose (fp);
+        fclose(mrtg_log_file_ptr);
 
         /* if we couldn't read enough data, return an unknown error */
         if (line <= 2)
-                usage4 (_("Unable to process MRTG log file"));
+                usage4(_("Unable to process MRTG log file"));
 
         /* make sure the MRTG data isn't too old */
-        time (&current_time);
-        if ((expire_minutes > 0) &&
-            (current_time - timestamp) > (expire_minutes * 60))
-                die (STATE_WARNING,     _("MRTG data has expired (%d minutes old)\n"),
-                     (int) ((current_time - timestamp) / 60));
+        time_t current_time;
+        time(&current_time);
+        if ((expire_minutes > 0) && (current_time - timestamp) > (expire_minutes * 60))
+                die(STATE_WARNING, _("MRTG data has expired (%d minutes old)\n"), (int)((current_time - timestamp) / 60));
 
+        unsigned long incoming_rate = 0L;
+        unsigned long outgoing_rate = 0L;
         /* else check the incoming/outgoing rates */
         if (use_average) {
                 incoming_rate = average_incoming_rate;
                 outgoing_rate = average_outgoing_rate;
-        }
-        else {
+        } else {
                 incoming_rate = maximum_incoming_rate;
                 outgoing_rate = maximum_outgoing_rate;
         }
 
+        double adjusted_incoming_rate = 0.0;
+        char incoming_speed_rating[8];
         /* report incoming traffic in Bytes/sec */
         if (incoming_rate < 1024) {
-                strcpy (incoming_speed_rating, "B");
-                adjusted_incoming_rate = (double) incoming_rate;
+                strcpy(incoming_speed_rating, "B");
+                adjusted_incoming_rate = (double)incoming_rate;
         }
 
         /* report incoming traffic in KBytes/sec */
         else if (incoming_rate < (1024 * 1024)) {
-                strcpy (incoming_speed_rating, "KB");
-                adjusted_incoming_rate = (double) (incoming_rate / 1024.0);
+                strcpy(incoming_speed_rating, "KB");
+                adjusted_incoming_rate = (double)(incoming_rate / 1024.0);
         }
 
         /* report incoming traffic in MBytes/sec */
         else {
-                strcpy (incoming_speed_rating, "MB");
-                adjusted_incoming_rate = (double) (incoming_rate / 1024.0 / 1024.0);
+                strcpy(incoming_speed_rating, "MB");
+                adjusted_incoming_rate = (double)(incoming_rate / 1024.0 / 1024.0);
         }
 
+        double adjusted_outgoing_rate = 0.0;
+        char outgoing_speed_rating[8];
         /* report outgoing traffic in Bytes/sec */
         if (outgoing_rate < 1024) {
-                strcpy (outgoing_speed_rating, "B");
-                adjusted_outgoing_rate = (double) outgoing_rate;
+                strcpy(outgoing_speed_rating, "B");
+                adjusted_outgoing_rate = (double)outgoing_rate;
         }
 
         /* report outgoing traffic in KBytes/sec */
         else if (outgoing_rate < (1024 * 1024)) {
-                strcpy (outgoing_speed_rating, "KB");
-                adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0);
+                strcpy(outgoing_speed_rating, "KB");
+                adjusted_outgoing_rate = (double)(outgoing_rate / 1024.0);
         }
 
         /* report outgoing traffic in MBytes/sec */
         else {
-                strcpy (outgoing_speed_rating, "MB");
-                adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0 / 1024.0);
+                strcpy(outgoing_speed_rating, "MB");
+                adjusted_outgoing_rate = (double)(outgoing_rate / 1024.0 / 1024.0);
         }
 
-        if (incoming_rate > incoming_critical_threshold
-                        || outgoing_rate > outgoing_critical_threshold) {
+        int result = STATE_OK;
+        if (incoming_rate > incoming_critical_threshold || outgoing_rate > outgoing_critical_threshold) {
                 result = STATE_CRITICAL;
-        }
-        else if (incoming_rate > incoming_warning_threshold
-                                         || outgoing_rate > outgoing_warning_threshold) {
+        } else if (incoming_rate > incoming_warning_threshold || outgoing_rate > outgoing_warning_threshold) {
                 result = STATE_WARNING;
         }
 
-        xasprintf (&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"),
-                  (use_average) ? _("Avg") : _("Max"), adjusted_incoming_rate,
-                  incoming_speed_rating, (use_average) ? _("Avg") : _("Max"),
-                  adjusted_outgoing_rate, outgoing_speed_rating,
-                  fperfdata("in", adjusted_incoming_rate, incoming_speed_rating,
-                           (int)incoming_warning_threshold, incoming_warning_threshold,
-                           (int)incoming_critical_threshold, incoming_critical_threshold,
-                           true, 0, false, 0),
-                  fperfdata("out", adjusted_outgoing_rate, outgoing_speed_rating,
-                           (int)outgoing_warning_threshold, outgoing_warning_threshold,
-                           (int)outgoing_critical_threshold, outgoing_critical_threshold,
-                           true, 0, false, 0));
-
-        printf (_("Traffic %s - %s\n"), state_text(result), error_message);
+        char *error_message;
+        xasprintf(&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"), (use_average) ? _("Avg") : _("Max"),
+                          adjusted_incoming_rate, incoming_speed_rating, (use_average) ? _("Avg") : _("Max"), adjusted_outgoing_rate,
+                          outgoing_speed_rating,
+                          fperfdata("in", adjusted_incoming_rate, incoming_speed_rating, (int)incoming_warning_threshold, incoming_warning_threshold,
+                                                (int)incoming_critical_threshold, incoming_critical_threshold, true, 0, false, 0),
+                          fperfdata("out", adjusted_outgoing_rate, outgoing_speed_rating, (int)outgoing_warning_threshold, outgoing_warning_threshold,
+                                                (int)outgoing_critical_threshold, outgoing_critical_threshold, true, 0, false, 0));
+
+        printf(_("Traffic %s - %s\n"), state_text(result), error_message);
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"filename", required_argument, 0, 'F'},
-                {"expires", required_argument, 0, 'e'},
-                {"aggregation", required_argument, 0, 'a'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"filename", required_argument, 0, 'F'},
+                                                                           {"expires", required_argument, 0, 'e'},
+                                                                           {"aggregation", required_argument, 0, 'a'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0)
+                        strcpy(argv[i], "-t");
+                else if (strcmp("-wt", argv[i]) == 0)
+                        strcpy(argv[i], "-w");
+                else if (strcmp("-ct", argv[i]) == 0)
+                        strcpy(argv[i], "-c");
         }
 
+        int option_char;
+        int option = 0;
         while (1) {
-                c = getopt_long (argc, argv, "hVF:e:a:c:w:", longopts, &option);
+                option_char = getopt_long(argc, argv, "hVF:e:a:c:w:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case 'F':                                                                       /* input file */
+                switch (option_char) {
+                case 'F': /* input file */
                         log_file = optarg;
                         break;
-                case 'e':                                                                       /* expiration time */
-                        expire_minutes = atoi (optarg);
+                case 'e': /* expiration time */
+                        expire_minutes = atoi(optarg);
                         break;
-                case 'a':                                                                       /* aggregation (AVE or MAX) */
-                        if (!strcmp (optarg, "MAX"))
+                case 'a': /* aggregation (AVE or MAX) */
+                        if (!strcmp(optarg, "MAX"))
                                 use_average = false;
                         else
                                 use_average = true;
                         break;
-                case 'c':                                                                       /* warning threshold */
-                        sscanf (optarg, "%lu,%lu", &incoming_critical_threshold,
-                                                        &outgoing_critical_threshold);
+                case 'c': /* warning threshold */
+                        sscanf(optarg, "%lu,%lu", &incoming_critical_threshold, &outgoing_critical_threshold);
                         break;
-                case 'w':                                                                       /* critical threshold */
-                        sscanf (optarg, "%lu,%lu", &incoming_warning_threshold,
-                                                        &outgoing_warning_threshold);
+                case 'w': /* critical threshold */
+                        sscanf(optarg, "%lu,%lu", &incoming_warning_threshold, &outgoing_warning_threshold);
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (argc > c && log_file == NULL) {
-                log_file = argv[c++];
+        option_char = optind;
+        if (argc > option_char && log_file == NULL) {
+                log_file = argv[option_char++];
         }
 
-        if (argc > c && expire_minutes == -1) {
-                expire_minutes = atoi (argv[c++]);
+        if (argc > option_char && expire_minutes == -1) {
+                expire_minutes = atoi(argv[option_char++]);
         }
 
-        if (argc > c && strcmp (argv[c], "MAX") == 0) {
+        if (argc > option_char && strcmp(argv[option_char], "MAX") == 0) {
                 use_average = false;
-                c++;
-        }
-        else if (argc > c && strcmp (argv[c], "AVG") == 0) {
+                option_char++;
+        } else if (argc > option_char && strcmp(argv[option_char], "AVG") == 0) {
                 use_average = true;
-                c++;
+                option_char++;
         }
 
-        if (argc > c && incoming_warning_threshold == 0) {
-                incoming_warning_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && incoming_warning_threshold == 0) {
+                incoming_warning_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        if (argc > c && incoming_critical_threshold == 0) {
-                incoming_critical_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && incoming_critical_threshold == 0) {
+                incoming_critical_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        if (argc > c && outgoing_warning_threshold == 0) {
-                outgoing_warning_threshold = strtoul (argv[c++], NULL, 10);
-        }
-        
-        if (argc > c && outgoing_critical_threshold == 0) {
-                outgoing_critical_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && outgoing_warning_threshold == 0) {
+                outgoing_warning_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        return validate_arguments ();
-}
-
+        if (argc > option_char && outgoing_critical_threshold == 0) {
+                outgoing_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+        }
 
-int
-validate_arguments (void)
-{
         return OK;
 }
 
-
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf ("%s\n", _("This plugin will check the incoming/outgoing transfer rates of a router,"));
-  printf ("%s\n", _("switch, etc recorded in an MRTG log.  If the newest log entry is older"));
-  printf ("%s\n", _("than <expire_minutes>, a WARNING status is returned. If either the"));
-  printf ("%s\n", _("incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"));
-  printf ("%s\n", _("Bytes/sec), a CRITICAL status results.  If either of the rates exceed"));
-  printf ("%s\n", _("the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (" %s\n", "-F, --filename=STRING");
-  printf ("    %s\n", _("File to read log from"));
-  printf (" %s\n", "-e, --expires=INTEGER");
-  printf ("    %s\n", _("Minutes after which log expires"));
-  printf (" %s\n", "-a, --aggregation=(AVG|MAX)");
-  printf ("    %s\n", _("Test average or maximum"));
-  printf (" %s\n", "-w, --warning");
-  printf ("    %s\n", _("Warning threshold pair <incoming>,<outgoing>"));
-  printf (" %s\n", "-c, --critical");
-  printf ("    %s\n", _("Critical threshold pair <incoming>,<outgoing>"));
-
-  printf ("\n");
-        printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"));
-  printf (" %s\n", "  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
-  printf (" %s\n", _("- While MRTG can monitor things other than traffic rates, this"));
-  printf (" %s\n", _("  plugin probably won't work with much else without modification."));
-  printf (" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually"));
-  printf (" %s\n", _("  reports.  I'm not sure why this is right now, but will look into it"));
-  printf (" %s\n", _("  for future enhancements of this plugin."));
-
-        printf (UT_SUPPORT);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf("%s\n", _("This plugin will check the incoming/outgoing transfer rates of a router,"));
+        printf("%s\n", _("switch, etc recorded in an MRTG log.  If the newest log entry is older"));
+        printf("%s\n", _("than <expire_minutes>, a WARNING status is returned. If either the"));
+        printf("%s\n", _("incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"));
+        printf("%s\n", _("Bytes/sec), a CRITICAL status results.  If either of the rates exceed"));
+        printf("%s\n", _("the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-F, --filename=STRING");
+        printf("    %s\n", _("File to read log from"));
+        printf(" %s\n", "-e, --expires=INTEGER");
+        printf("    %s\n", _("Minutes after which log expires"));
+        printf(" %s\n", "-a, --aggregation=(AVG|MAX)");
+        printf("    %s\n", _("Test average or maximum"));
+        printf(" %s\n", "-w, --warning");
+        printf("    %s\n", _("Warning threshold pair <incoming>,<outgoing>"));
+        printf(" %s\n", "-c, --critical");
+        printf("    %s\n", _("Critical threshold pair <incoming>,<outgoing>"));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"));
+        printf(" %s\n", "  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
+        printf(" %s\n", _("- While MRTG can monitor things other than traffic rates, this"));
+        printf(" %s\n", _("  plugin probably won't work with much else without modification."));
+        printf(" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually"));
+        printf(" %s\n", _("  reports.  I'm not sure why this is right now, but will look into it"));
+        printf(" %s\n", _("  for future enhancements of this plugin."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf (_("Usage"));
-  printf (" %s -F <log_file> -a <AVG | MAX> -w <warning_pair>\n",progname);
-  printf ("-c <critical_pair> [-e expire_minutes]\n");
+void print_usage(void) {
+        printf(_("Usage"));
+        printf(" %s -F <log_file> -a <AVG | MAX> -w <warning_pair>\n", progname);
+        printf("-c <critical_pair> [-e expire_minutes]\n");
 }
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 15ec04c..1f0b709 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -5,7 +5,7 @@
 * License: GPL
 * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2011 Monitoring Plugins Development Team
+* Copyright (c) 1999-2024 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 *****************************************************************************/
 
 const char *progname = "check_mysql";
-const char *copyright = "1999-2011";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #define SLAVERESULTSIZE 96
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 842b7a2..79b6e2f 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_mysql_query plugin
-* 
-* License: GPL
-* Copyright (c) 2006-2009 Monitoring Plugins Development Team
-* Original code from check_mysql, copyright 1999 Didi Rieder
-* 
-* Description:
-* 
-* This file contains the check_mysql_query plugin
-* 
-* This plugin is for running arbitrary SQL and checking the results
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_mysql_query plugin
+ *
+ * License: GPL
+ * Copyright (c) 2006-2024 Monitoring Plugins Development Team
+ * Original code from check_mysql, copyright 1999 Didi Rieder
+ *
+ * Description:
+ *
+ * This file contains the check_mysql_query plugin
+ *
+ * This plugin is for running arbitrary SQL and checking the results
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_mysql_query";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -41,117 +41,109 @@ const char *email = "devel@monitoring-plugins.org";
 #include <mysql.h>
 #include <errmsg.h>
 
-char *db_user = NULL;
-char *db_host = NULL;
-char *db_socket = NULL;
-char *db_pass = NULL;
-char *db = NULL;
-char *opt_file = NULL;
-char *opt_group = NULL;
-unsigned int db_port = MYSQL_PORT;
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-char *sql_query = NULL;
-int verbose = 0;
-thresholds *my_thresholds = NULL;
-
-
-int
-main (int argc, char **argv)
-{
-
-        MYSQL mysql;
-        MYSQL_RES *res;
-        MYSQL_ROW row;
-        
-        double value;
-        char *error = NULL;
-        int status;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+static char *db_user = NULL;
+static char *db_host = NULL;
+static char *db_socket = NULL;
+static char *db_pass = NULL;
+static char *db = NULL;
+static char *opt_file = NULL;
+static char *opt_group = NULL;
+static unsigned int db_port = MYSQL_PORT;
+
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int validate_arguments(void);
+static void print_help(void);
+void print_usage(void);
+
+static char *sql_query = NULL;
+static int verbose = 0;
+static thresholds *my_thresholds = NULL;
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
+        MYSQL mysql;
         /* initialize mysql  */
-        mysql_init (&mysql);
+        mysql_init(&mysql);
 
         if (opt_file != NULL)
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_FILE, opt_file);
 
         if (opt_group != NULL)
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, opt_group);
         else
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "client");
 
         /* establish a connection to the server and error checking */
-        if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
-                if (mysql_errno (&mysql) == CR_UNKNOWN_HOST)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_VERSION_ERROR)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_OUT_OF_MEMORY)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_IPSOCK_ERROR)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_SOCKET_CREATE_ERROR)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
+        if (!mysql_real_connect(&mysql, db_host, db_user, db_pass, db, db_port, db_socket, 0)) {
+                if (mysql_errno(&mysql) == CR_UNKNOWN_HOST)
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                else if (mysql_errno(&mysql) == CR_VERSION_ERROR)
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                else if (mysql_errno(&mysql) == CR_OUT_OF_MEMORY)
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                else if (mysql_errno(&mysql) == CR_IPSOCK_ERROR)
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                else if (mysql_errno(&mysql) == CR_SOCKET_CREATE_ERROR)
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
                 else
-                        die (STATE_CRITICAL, "QUERY %s: %s\n", _("CRITICAL"), mysql_error (&mysql));
+                        die(STATE_CRITICAL, "QUERY %s: %s\n", _("CRITICAL"), mysql_error(&mysql));
         }
 
-        if (mysql_query (&mysql, sql_query) != 0) {
+        char *error = NULL;
+        if (mysql_query(&mysql, sql_query) != 0) {
                 error = strdup(mysql_error(&mysql));
-                mysql_close (&mysql);
-                die (STATE_CRITICAL, "QUERY %s: %s - %s\n", _("CRITICAL"), _("Error with query"), error);
+                mysql_close(&mysql);
+                die(STATE_CRITICAL, "QUERY %s: %s - %s\n", _("CRITICAL"), _("Error with query"), error);
         }
 
+        MYSQL_RES *res;
         /* store the result */
-        if ( (res = mysql_store_result (&mysql)) == NULL) {
+        if ((res = mysql_store_result(&mysql)) == NULL) {
                 error = strdup(mysql_error(&mysql));
-                mysql_close (&mysql);
-                die (STATE_CRITICAL, "QUERY %s: Error with store_result - %s\n", _("CRITICAL"), error);
+                mysql_close(&mysql);
+                die(STATE_CRITICAL, "QUERY %s: Error with store_result - %s\n", _("CRITICAL"), error);
         }
 
         /* Check there is some data */
         if (mysql_num_rows(res) == 0) {
                 mysql_close(&mysql);
-                die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("No rows returned"));
+                die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("No rows returned"));
         }
 
+        MYSQL_ROW row;
         /* fetch the first row */
-        if ( (row = mysql_fetch_row (res)) == NULL) {
+        if ((row = mysql_fetch_row(res)) == NULL) {
                 error = strdup(mysql_error(&mysql));
-                mysql_free_result (res);
-                mysql_close (&mysql);
-                die (STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
+                mysql_free_result(res);
+                mysql_close(&mysql);
+                die(STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
         }
 
-        if (! is_numeric(row[0])) {
-                die (STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
+        if (!is_numeric(row[0])) {
+                die(STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
         }
 
-        value = strtod(row[0], NULL);
+        double value = strtod(row[0], NULL);
 
         /* free the result */
-        mysql_free_result (res);
+        mysql_free_result(res);
 
         /* close the connection */
-        mysql_close (&mysql);
+        mysql_close(&mysql);
 
         if (verbose >= 3)
                 printf("mysql result: %f\n", value);
 
-        status = get_status(value, my_thresholds);
+        int status = get_status(value, my_thresholds);
 
         if (status == STATE_OK) {
                 printf("QUERY %s: ", _("OK"));
@@ -161,73 +153,54 @@ main (int argc, char **argv)
                 printf("QUERY %s: ", _("CRITICAL"));
         }
         printf(_("'%s' returned %f | %s"), sql_query, value,
-                fperfdata("result", value, "",
-                my_thresholds->warning?true:false, my_thresholds->warning?my_thresholds->warning->end:0,
-                my_thresholds->critical?true:false, my_thresholds->critical?my_thresholds->critical->end:0,
-                false, 0,
-                false, 0)
-        );
+                   fperfdata("result", value, "", my_thresholds->warning ? true : false, my_thresholds->warning ? my_thresholds->warning->end : 0,
+                                         my_thresholds->critical ? true : false, my_thresholds->critical ? my_thresholds->critical->end : 0, false, 0, false,
+                                         0));
         printf("\n");
 
         return status;
 }
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-        char *warning = NULL;
-        char *critical = NULL;
-
-        int option = 0;
+int process_arguments(int argc, char **argv) {
         static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"socket", required_argument, 0, 's'},
-                {"database", required_argument, 0, 'd'},
-                {"username", required_argument, 0, 'u'},
-                {"password", required_argument, 0, 'p'},
-                {"file", required_argument, 0, 'f'},
-                {"group", required_argument, 0, 'g'},
-                {"port", required_argument, 0, 'P'},
-                {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"query", required_argument, 0, 'q'},
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {0, 0, 0, 0}
-        };
+                {"hostname", required_argument, 0, 'H'}, {"socket", required_argument, 0, 's'},   {"database", required_argument, 0, 'd'},
+                {"username", required_argument, 0, 'u'}, {"password", required_argument, 0, 'p'}, {"file", required_argument, 0, 'f'},
+                {"group", required_argument, 0, 'g'},    {"port", required_argument, 0, 'P'},     {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},           {"query", required_argument, 0, 'q'},
+                {"warning", required_argument, 0, 'w'},  {"critical", required_argument, 0, 'c'}, {0, 0, 0, 0}};
 
         if (argc < 1)
                 return ERROR;
 
-        while (1) {
-                c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option);
+        char *warning = NULL;
+        char *critical = NULL;
+
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
+                switch (option_char) {
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
                                 db_host = optarg;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 's':                                                                       /* socket */
+                case 's': /* socket */
                         db_socket = optarg;
                         break;
-                case 'd':                                                                       /* database */
+                case 'd': /* database */
                         db = optarg;
                         break;
-                case 'u':                                                                       /* username */
+                case 'u': /* username */
                         db_user = optarg;
                         break;
-                case 'p':                                                                       /* authentication information: password */
+                case 'p': /* authentication information: password */
                         db_pass = strdup(optarg);
 
                         /* Delete the password from process list */
@@ -236,24 +209,24 @@ process_arguments (int argc, char **argv)
                                 optarg++;
                         }
                         break;
-                case 'f':                                                                       /* client options file */
+                case 'f': /* client options file */
                         opt_file = optarg;
                         break;
-                case 'g':                                                                       /* client options group */
+                case 'g': /* client options group */
                         opt_group = optarg;
                         break;
-                case 'P':                                                                       /* critical time threshold */
-                        db_port = atoi (optarg);
+                case 'P': /* critical time threshold */
+                        db_port = atoi(optarg);
                         break;
                 case 'v':
                         verbose++;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
                 case 'q':
                         xasprintf(&sql_query, "%s", optarg);
                         break;
@@ -263,22 +236,17 @@ process_arguments (int argc, char **argv)
                 case 'c':
                         critical = optarg;
                         break;
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-
         set_thresholds(&my_thresholds, warning, critical);
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-
-int
-validate_arguments (void)
-{
+int validate_arguments(void) {
         if (sql_query == NULL)
                 usage("Must specify a SQL query to run");
 
@@ -294,61 +262,55 @@ validate_arguments (void)
         return OK;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", MYSQL_PORT);
-
-        print_revision (progname, NP_VERSION);
-
-        printf (_(COPYRIGHT), copyright, email);
-
-        printf ("%s\n", _("This program checks a query result against threshold levels"));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (" -q, --query=STRING\n");
-        printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
-        printf (UT_WARN_CRIT_RANGE);
-        printf (UT_HOST_PORT, 'P', myport);
-        printf (" %s\n", "-s, --socket=STRING");
-        printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
-        printf (" -d, --database=STRING\n");
-        printf ("    %s\n", _("Database to check"));
-        printf (" %s\n", "-f, --file=STRING");
-        printf ("    %s\n", _("Read from the specified client options file"));
-        printf (" %s\n", "-g, --group=STRING");
-        printf ("    %s\n", _("Use a client options group"));
-        printf (" -u, --username=STRING\n");
-        printf ("    %s\n", _("Username to login with"));
-        printf (" -p, --password=STRING\n");
-        printf ("    %s\n", _("Password to login with"));
-        printf ("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
-        printf ("    %s\n", _("Your clear-text password could be visible as a process table entry"));
-
-        printf ("\n");
-        printf (" %s\n", _("A query is required. The result from the query should be numeric."));
-        printf (" %s\n", _("For extra security, create a user with minimal access."));
-
-        printf ("\n");
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
-        printf (" %s\n", _("overriding any my.cnf settings."));
-
-        printf (UT_SUPPORT);
-}
+        xasprintf(&myport, "%d", MYSQL_PORT);
+
+        print_revision(progname, NP_VERSION);
+
+        printf(_(COPYRIGHT), copyright, email);
+
+        printf("%s\n", _("This program checks a query result against threshold levels"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(" -q, --query=STRING\n");
+        printf("    %s\n", _("SQL query to run. Only first column in first row will be read"));
+        printf(UT_WARN_CRIT_RANGE);
+        printf(UT_HOST_PORT, 'P', myport);
+        printf(" %s\n", "-s, --socket=STRING");
+        printf("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
+        printf(" -d, --database=STRING\n");
+        printf("    %s\n", _("Database to check"));
+        printf(" %s\n", "-f, --file=STRING");
+        printf("    %s\n", _("Read from the specified client options file"));
+        printf(" %s\n", "-g, --group=STRING");
+        printf("    %s\n", _("Use a client options group"));
+        printf(" -u, --username=STRING\n");
+        printf("    %s\n", _("Username to login with"));
+        printf(" -p, --password=STRING\n");
+        printf("    %s\n", _("Password to login with"));
+        printf("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
+        printf("    %s\n", _("Your clear-text password could be visible as a process table entry"));
+
+        printf("\n");
+        printf(" %s\n", _("A query is required. The result from the query should be numeric."));
+        printf(" %s\n", _("For extra security, create a user with minimal access."));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+        printf(" %s\n", _("overriding any my.cnf settings."));
 
+        printf(UT_SUPPORT);
+}
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname);
-  printf ("       [-d database] [-u user] [-p password] [-f optfile] [-g group]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n", progname);
+        printf("       [-d database] [-u user] [-p password] [-f optfile] [-g group]\n");
 }
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 40d68f0..48629be 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -1,58 +1,56 @@
 /*****************************************************************************
-* 
-* Monitoring check_nagios plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_nagios plugin
-* 
-* This plugin checks the status of the Nagios process on the local machine.
-* The plugin will check to make sure the Nagios status log is no older than
-* the number of minutes specified by the expires option.
-* It also checks the process table for a process matching the command
-* argument.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_nagios plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_nagios plugin
+ *
+ * This plugin checks the status of the Nagios process on the local machine.
+ * The plugin will check to make sure the Nagios status log is no older than
+ * the number of minutes specified by the expires option.
+ * It also checks the process table for a process matching the command
+ * argument.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_nagios";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
 #include "utils.h"
 
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+void print_usage(void);
 
-char *status_log = NULL;
-char *process_string = NULL;
-int expire_minutes = 0;
+static char *status_log = NULL;
+static char *process_string = NULL;
+static int expire_minutes = 0;
 
-int verbose = 0;
+static int verbose = 0;
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int result = STATE_UNKNOWN;
         char input_buffer[MAX_INPUT_BUFFER];
         unsigned long latest_entry_time = 0L;
@@ -73,253 +71,231 @@ main (int argc, char **argv)
 #endif /* PS_USES_PROCETIME */
         char procprog[MAX_INPUT_BUFFER];
         char *procargs;
-        int pos, cols;
+        int pos;
+        int cols;
         int expected_cols = PS_COLS - 1;
         const char *zombie = "Z";
         char *temp_string;
-        output chld_out, chld_err;
+        output chld_out;
+        output chld_err;
         size_t i;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
+        if (process_arguments(argc, argv) == ERROR)
                 usage_va(_("Could not parse arguments"));
 
         /* Set signal handling and alarm timeout */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
         }
 
         /* handle timeouts gracefully... */
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
         /* open the status log */
-        fp = fopen (status_log, "r");
+        fp = fopen(status_log, "r");
         if (fp == NULL) {
-                die (STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot open status log for reading!"));
+                die(STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot open status log for reading!"));
         }
 
         /* get the date/time of the last item updated in the log */
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-                if ((temp_ptr = strstr (input_buffer, "created=")) != NULL) {
-                        temp_entry_time = strtoul (temp_ptr + 8, NULL, 10);
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+                if ((temp_ptr = strstr(input_buffer, "created=")) != NULL) {
+                        temp_entry_time = strtoul(temp_ptr + 8, NULL, 10);
                         latest_entry_time = temp_entry_time;
                         break;
-                } else if ((temp_ptr = strtok (input_buffer, "]")) != NULL) {
-                        temp_entry_time = strtoul (temp_ptr + 1, NULL, 10);
+                }
+                if ((temp_ptr = strtok(input_buffer, "]")) != NULL) {
+                        temp_entry_time = strtoul(temp_ptr + 1, NULL, 10);
                         if (temp_entry_time > latest_entry_time)
                                 latest_entry_time = temp_entry_time;
                 }
         }
-        fclose (fp);
+        fclose(fp);
 
         if (verbose >= 2)
                 printf("command: %s\n", PS_COMMAND);
 
         /* run the command to check for the Nagios process.. */
-        if((result = np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0)) != 0)
+        if ((result = np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0)) != 0)
                 result = STATE_WARNING;
 
         /* count the number of matching Nagios processes... */
-        for(i = 0; i < chld_out.lines; i++) {
-                cols = sscanf (chld_out.line[i], PS_FORMAT, PS_VARLIST);
+        for (i = 0; i < chld_out.lines; i++) {
+                cols = sscanf(chld_out.line[i], PS_FORMAT, PS_VARLIST);
                 /* Zombie processes do not give a procprog command */
-                if ( cols == (expected_cols - 1) && strstr(procstat, zombie) ) {
+                if (cols == (expected_cols - 1) && strstr(procstat, zombie)) {
                         cols = expected_cols;
                         /* Set some value for procargs for the strip command further below
                          * Seen to be a problem on some Solaris 7 and 8 systems */
                         chld_out.line[i][pos] = '\n';
-                        chld_out.line[i][pos+1] = 0x0;
+                        chld_out.line[i][pos + 1] = 0x0;
                 }
-                if ( cols >= expected_cols ) {
-                        xasprintf (&procargs, "%s", chld_out.line[i] + pos);
-                        strip (procargs);
+                if (cols >= expected_cols) {
+                        xasprintf(&procargs, "%s", chld_out.line[i] + pos);
+                        strip(procargs);
 
                         /* Some ps return full pathname for command. This removes path */
-                        temp_string = strtok ((char *)procprog, "/");
+                        temp_string = strtok((char *)procprog, "/");
                         while (temp_string) {
                                 strcpy(procprog, temp_string);
-                                temp_string = strtok (NULL, "/");
+                                temp_string = strtok(NULL, "/");
                         }
 
                         /* May get empty procargs */
-                        if (!strstr(procargs, argv[0]) && strstr(procargs, process_string) && strcmp(procargs,"")) {
+                        if (!strstr(procargs, argv[0]) && strstr(procargs, process_string) && strcmp(procargs, "")) {
                                 proc_entries++;
                                 if (verbose >= 2) {
-                                        printf (_("Found process: %s %s\n"), procprog, procargs);
+                                        printf(_("Found process: %s %s\n"), procprog, procargs);
                                 }
                         }
                 }
         }
 
         /* If we get anything on stderr, at least set warning */
-        if(chld_err.buflen)
-                result = max_state (result, STATE_WARNING);
+        if (chld_err.buflen)
+                result = max_state(result, STATE_WARNING);
 
         /* reset the alarm handler */
-        alarm (0);
+        alarm(0);
 
         if (proc_entries == 0) {
-                die (STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Could not locate a running Nagios process!"));
+                die(STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Could not locate a running Nagios process!"));
         }
 
         if (latest_entry_time == 0L) {
-                die (STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot parse Nagios log file for valid time"));
+                die(STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot parse Nagios log file for valid time"));
         }
 
-        time (&current_time);
+        time(&current_time);
         if ((int)(current_time - latest_entry_time) > (expire_minutes * 60)) {
                 result = STATE_WARNING;
         } else {
                 result = STATE_OK;
         }
 
-        printf ("NAGIOS %s: ", (result == STATE_OK) ? _("OK") : _("WARNING"));
-        printf (ngettext ("%d process", "%d processes", proc_entries), proc_entries);
-        printf (", ");
-        printf (
-          ngettext ("status log updated %d second ago",
-            "status log updated %d seconds ago",
-            (int) (current_time - latest_entry_time) ),
-            (int) (current_time - latest_entry_time) );
-        printf ("\n");
+        printf("NAGIOS %s: ", (result == STATE_OK) ? _("OK") : _("WARNING"));
+        printf(ngettext("%d process", "%d processes", proc_entries), proc_entries);
+        printf(", ");
+        printf(ngettext("status log updated %d second ago", "status log updated %d seconds ago", (int)(current_time - latest_entry_time)),
+                   (int)(current_time - latest_entry_time));
+        printf("\n");
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
         int c;
 
         int option = 0;
-        static struct option longopts[] = {
-                {"filename", required_argument, 0, 'F'},
-                {"expires", required_argument, 0, 'e'},
-                {"command", required_argument, 0, 'C'},
-                {"timeout", optional_argument, 0, 't'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {{"filename", required_argument, 0, 'F'}, {"expires", required_argument, 0, 'e'},
+                                                                           {"command", required_argument, 0, 'C'},  {"timeout", optional_argument, 0, 't'},
+                                                                           {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},
+                                                                           {"verbose", no_argument, 0, 'v'},        {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
-        if (!is_option (argv[1])) {
+        if (!is_option(argv[1])) {
                 status_log = argv[1];
-                if (is_intnonneg (argv[2]))
-                        expire_minutes = atoi (argv[2]);
+                if (is_intnonneg(argv[2]))
+                        expire_minutes = atoi(argv[2]);
                 else
-                        die (STATE_UNKNOWN,
-                                                                 _("Expiration time must be an integer (seconds)\n"));
+                        die(STATE_UNKNOWN, _("Expiration time must be an integer (seconds)\n"));
                 process_string = argv[3];
                 return OK;
         }
 
         while (1) {
-                c = getopt_long (argc, argv, "+hVvF:C:e:t:", longopts, &option);
+                c = getopt_long(argc, argv, "+hVvF:C:e:t:", longopts, &option);
 
                 if (c == -1 || c == EOF || c == 1)
                         break;
 
                 switch (c) {
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'F':                                                                       /* status log */
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'F': /* status log */
                         status_log = optarg;
                         break;
-                case 'C':                                                                       /* command */
+                case 'C': /* command */
                         process_string = optarg;
                         break;
-                case 'e':                                                                       /* expiry time */
-                        if (is_intnonneg (optarg))
-                                expire_minutes = atoi (optarg);
+                case 'e': /* expiry time */
+                        if (is_intnonneg(optarg))
+                                expire_minutes = atoi(optarg);
                         else
-                                die (STATE_UNKNOWN,
-                                     _("Expiration time must be an integer (seconds)\n"));
+                                die(STATE_UNKNOWN, _("Expiration time must be an integer (seconds)\n"));
                         break;
-                case 't':                                                                       /* timeout */
-                        if (is_intnonneg (optarg))
-                                timeout_interval = atoi (optarg);
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg))
+                                timeout_interval = atoi(optarg);
                         else
-                                die (STATE_UNKNOWN,
-                                     _("Timeout must be an integer (seconds)\n"));
+                                die(STATE_UNKNOWN, _("Timeout must be an integer (seconds)\n"));
                         break;
                 case 'v':
                         verbose++;
                         break;
-                default:                                                                        /* print short usage_va statement if args not parsable */
+                default: /* print short usage_va statement if args not parsable */
                         usage5();
                 }
         }
 
-
         if (status_log == NULL)
-                die (STATE_UNKNOWN, _("You must provide the status_log\n"));
+                die(STATE_UNKNOWN, _("You must provide the status_log\n"));
 
         if (process_string == NULL)
-                die (STATE_UNKNOWN, _("You must provide a process string\n"));
+                die(STATE_UNKNOWN, _("You must provide a process string\n"));
 
         return OK;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf(_(COPYRIGHT), copyright, email);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+        printf("%s\n", _("This plugin checks the status of the Nagios process on the local machine"));
+        printf("%s\n", _("The plugin will check to make sure the Nagios status log is no older than"));
+        printf("%s\n", _("the number of minutes specified by the expires option."));
+        printf("%s\n", _("It also checks the process table for a process matching the command argument."));
 
-        printf (_(COPYRIGHT), copyright, email);
+        printf("\n\n");
 
-        printf ("%s\n", _("This plugin checks the status of the Nagios process on the local machine"));
-  printf ("%s\n", _("The plugin will check to make sure the Nagios status log is no older than"));
-  printf ("%s\n", _("the number of minutes specified by the expires option."));
-  printf ("%s\n", _("It also checks the process table for a process matching the command argument."));
+        print_usage();
 
-  printf ("\n\n");
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        print_usage ();
+        printf(" %s\n", "-F, --filename=FILE");
+        printf("    %s\n", _("Name of the log file to check"));
+        printf(" %s\n", "-e, --expires=INTEGER");
+        printf("    %s\n", _("Minutes aging after which logfile is considered stale"));
+        printf(" %s\n", "-C, --command=STRING");
+        printf("    %s\n", _("Substring to search for in process arguments"));
+        printf(" %s\n", "-t, --timeout=INTEGER");
+        printf("    %s\n", _("Timeout for the plugin in seconds"));
+        printf(UT_VERBOSE);
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_nagios -t 20 -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
 
-        printf (" %s\n", "-F, --filename=FILE");
-  printf ("    %s\n", _("Name of the log file to check"));
-  printf (" %s\n", "-e, --expires=INTEGER");
-  printf ("    %s\n", _("Minutes aging after which logfile is considered stale"));
-  printf (" %s\n", "-C, --command=STRING");
-  printf ("    %s\n", _("Substring to search for in process arguments"));
-  printf (" %s\n", "-t, --timeout=INTEGER");
-  printf ("    %s\n", _("Timeout for the plugin in seconds"));
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_nagios -t 20 -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -F <status log file> -t <timeout_seconds> -e <expire_minutes> -C <process_string>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -F <status log file> -t <timeout_seconds> -e <expire_minutes> -C <process_string>\n", progname);
 }
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 19c050d..413aad6 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -1,39 +1,39 @@
 /*****************************************************************************
-* 
-* Monitoring check_nt plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
-* Copyright (c) 2003-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_nt plugin
-* 
-* This plugin collects data from the NSClient service running on a
-* Windows NT/2000/XP/2003 server.
-* This plugin requires NSClient software to run on NT
-* (http://nsclient.ready2run.nl/)
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_nt plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
+ * Copyright (c) 2003-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_nt plugin
+ *
+ * This plugin collects data from the NSClient service running on a
+ * Windows NT/2000/XP/2003 server.
+ * This plugin requires NSClient software to run on NT
+ * (http://nsclient.ready2run.nl/)
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_nt";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -59,75 +59,75 @@ enum {
         PORT = 1248
 };
 
-char *server_address=NULL;
-char *volume_name=NULL;
-int server_port=PORT;
-char *value_list=NULL;
-char *req_password=NULL;
+char *server_address = NULL;
+char *volume_name = NULL;
+int server_port = PORT;
+char *value_list = NULL;
+char *req_password = NULL;
 unsigned long lvalue_list[MAX_VALUE_LIST];
-unsigned long warning_value=0L;
-unsigned long critical_value=0L;
-bool check_warning_value=false;
-bool check_critical_value=false;
+unsigned long warning_value = 0L;
+unsigned long critical_value = 0L;
+bool check_warning_value = false;
+bool check_critical_value = false;
 enum checkvars vars_to_check = CHECK_NONE;
 bool show_all = false;
 
 char recv_buffer[MAX_INPUT_BUFFER];
 
-void fetch_data (const char* address, int port, const char* sendb);
+void fetch_data(const char *address, int port, const char *sendb);
 int process_arguments(int, char **);
 void preparelist(char *string);
 bool strtoularray(unsigned long *array, char *string, const char *delim);
 void print_help(void);
 void print_usage(void);
 
-int main(int argc, char **argv){
+int main(int argc, char **argv) {
 
-/* should be    int result = STATE_UNKNOWN; */
+        /* should be    int result = STATE_UNKNOWN; */
 
         int return_code = STATE_UNKNOWN;
-        char *send_buffer=NULL;
-        char *output_message=NULL;
-        char *perfdata=NULL;
-        char *temp_string=NULL;
-        char *temp_string_perf=NULL;
-        char *description=NULL,*counter_unit = NULL;
+        char *send_buffer = NULL;
+        char *output_message = NULL;
+        char *perfdata = NULL;
+        char *temp_string = NULL;
+        char *temp_string_perf = NULL;
+        char *description = NULL, *counter_unit = NULL;
         char *minval = NULL, *maxval = NULL, *errcvt = NULL;
-        char *fds=NULL, *tds=NULL;
+        char *fds = NULL, *tds = NULL;
         char *numstr;
 
-        double total_disk_space=0;
-        double free_disk_space=0;
-        double percent_used_space=0;
-        double warning_used_space=0;
-        double critical_used_space=0;
-        double mem_commitLimit=0;
-        double mem_commitByte=0;
+        double total_disk_space = 0;
+        double free_disk_space = 0;
+        double percent_used_space = 0;
+        double warning_used_space = 0;
+        double critical_used_space = 0;
+        double mem_commitLimit = 0;
+        double mem_commitByte = 0;
         double fminval = 0, fmaxval = 0;
         unsigned long utilization;
         unsigned long uptime;
         unsigned long age_in_minutes;
         double counter_value = 0.0;
-        int offset=0;
-        int updays=0;
-        int uphours=0;
-        int upminutes=0;
+        int offset = 0;
+        int updays = 0;
+        int uphours = 0;
+        int upminutes = 0;
 
         bool isPercent = false;
         bool allRight = false;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if(process_arguments(argc,argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* initialize alarm signal handling */
-        signal(SIGALRM,socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
         alarm(socket_timeout);
@@ -137,61 +137,58 @@ int main(int argc, char **argv){
         case CHECK_CLIENTVERSION:
 
                 xasprintf(&send_buffer, "%s&1", req_password);
-                fetch_data (server_address, server_port, send_buffer);
+                fetch_data(server_address, server_port, send_buffer);
                 if (value_list != NULL && strcmp(recv_buffer, value_list) != 0) {
-                        xasprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
+                        xasprintf(&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
                         return_code = STATE_WARNING;
                 } else {
-                        xasprintf (&output_message, "%s", recv_buffer);
+                        xasprintf(&output_message, "%s", recv_buffer);
                         return_code = STATE_OK;
                 }
                 break;
 
         case CHECK_CPULOAD:
 
-                if (value_list==NULL)
-                        output_message = strdup (_("missing -l parameters"));
-                else if (! strtoularray(lvalue_list,value_list,","))
-                        output_message = strdup (_("wrong -l parameter."));
+                if (value_list == NULL)
+                        output_message = strdup(_("missing -l parameters"));
+                else if (!strtoularray(lvalue_list, value_list, ","))
+                        output_message = strdup(_("wrong -l parameter."));
                 else {
                         /* -l parameters is present with only integers */
-                        return_code=STATE_OK;
-                        temp_string = strdup (_("CPU Load"));
-                        temp_string_perf = strdup (" ");
+                        return_code = STATE_OK;
+                        temp_string = strdup(_("CPU Load"));
+                        temp_string_perf = strdup(" ");
 
                         /* loop until one of the parameters is wrong or not present */
-                        while (lvalue_list[0+offset]> (unsigned long)0 &&
-                                                 lvalue_list[0+offset]<=(unsigned long)17280 &&
-                                                 lvalue_list[1+offset]> (unsigned long)0 &&
-                                                 lvalue_list[1+offset]<=(unsigned long)100 &&
-                                                 lvalue_list[2+offset]> (unsigned long)0 &&
-                                                 lvalue_list[2+offset]<=(unsigned long)100) {
+                        while (lvalue_list[0 + offset] > (unsigned long)0 && lvalue_list[0 + offset] <= (unsigned long)17280 &&
+                                   lvalue_list[1 + offset] > (unsigned long)0 && lvalue_list[1 + offset] <= (unsigned long)100 &&
+                                   lvalue_list[2 + offset] > (unsigned long)0 && lvalue_list[2 + offset] <= (unsigned long)100) {
 
                                 /* Send request and retrieve data */
-                                xasprintf(&send_buffer,"%s&2&%lu",req_password,lvalue_list[0+offset]);
-                                fetch_data (server_address, server_port, send_buffer);
+                                xasprintf(&send_buffer, "%s&2&%lu", req_password, lvalue_list[0 + offset]);
+                                fetch_data(server_address, server_port, send_buffer);
 
-                                utilization=strtoul(recv_buffer,NULL,10);
+                                utilization = strtoul(recv_buffer, NULL, 10);
 
                                 /* Check if any of the request is in a warning or critical state */
-                                if(utilization >= lvalue_list[2+offset])
-                                        return_code=STATE_CRITICAL;
-                                else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING)
-                                        return_code=STATE_WARNING;
-
-                                xasprintf(&output_message,_(" %lu%% (%lu min average)"), utilization, lvalue_list[0+offset]);
-                                xasprintf(&temp_string,"%s%s",temp_string,output_message);
-                                xasprintf(&perfdata,_(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0+offset], utilization,
-                                  lvalue_list[1+offset], lvalue_list[2+offset]);
-                                xasprintf(&temp_string_perf,"%s%s",temp_string_perf,perfdata);
-                                offset+=3;      /* move across the array */
+                                if (utilization >= lvalue_list[2 + offset])
+                                        return_code = STATE_CRITICAL;
+                                else if (utilization >= lvalue_list[1 + offset] && return_code < STATE_WARNING)
+                                        return_code = STATE_WARNING;
+
+                                xasprintf(&output_message, _(" %lu%% (%lu min average)"), utilization, lvalue_list[0 + offset]);
+                                xasprintf(&temp_string, "%s%s", temp_string, output_message);
+                                xasprintf(&perfdata, _(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0 + offset], utilization,
+                                                  lvalue_list[1 + offset], lvalue_list[2 + offset]);
+                                xasprintf(&temp_string_perf, "%s%s", temp_string_perf, perfdata);
+                                offset += 3; /* move across the array */
                         }
 
-                        if (strlen(temp_string)>10) {  /* we had at least one loop */
-                                output_message = strdup (temp_string);
+                        if (strlen(temp_string) > 10) { /* we had at least one loop */
+                                output_message = strdup(temp_string);
                                 perfdata = temp_string_perf;
                         } else
-                                output_message = strdup (_("not enough values for -l parameters"));
+                                output_message = strdup(_("not enough values for -l parameters"));
                 }
                 break;
 
@@ -200,16 +197,14 @@ int main(int argc, char **argv){
                 if (value_list == NULL) {
                         value_list = "minutes";
                 }
-                if (strncmp(value_list, "seconds", strlen("seconds") + 1 ) &&
-                        strncmp(value_list, "minutes", strlen("minutes") + 1) &&
-                        strncmp(value_list, "hours", strlen("hours") + 1) &&
-                        strncmp(value_list, "days", strlen("days") + 1)) {
+                if (strncmp(value_list, "seconds", strlen("seconds") + 1) && strncmp(value_list, "minutes", strlen("minutes") + 1) &&
+                        strncmp(value_list, "hours", strlen("hours") + 1) && strncmp(value_list, "days", strlen("days") + 1)) {
 
-                        output_message = strdup (_("wrong -l argument"));
+                        output_message = strdup(_("wrong -l argument"));
                 } else {
                         xasprintf(&send_buffer, "%s&3", req_password);
-                        fetch_data (server_address, server_port, send_buffer);
-                        uptime=strtoul(recv_buffer,NULL,10);
+                        fetch_data(server_address, server_port, send_buffer);
+                        uptime = strtoul(recv_buffer, NULL, 10);
                         updays = uptime / 86400;
                         uphours = (uptime % 86400) / 3600;
                         upminutes = ((uptime % 86400) % 3600) / 60;
@@ -222,57 +217,58 @@ int main(int argc, char **argv){
                                 uptime = uptime / 86400;
                         /* else uptime in seconds, nothing to do */
 
-                        xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"),updays, uphours, upminutes, uptime);
+                        xasprintf(&output_message, _("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"), updays, uphours, upminutes,
+                                          uptime);
 
                         if (check_critical_value && uptime <= critical_value)
-                                return_code=STATE_CRITICAL;
+                                return_code = STATE_CRITICAL;
                         else if (check_warning_value && uptime <= warning_value)
-                                return_code=STATE_WARNING;
+                                return_code = STATE_WARNING;
                         else
-                                return_code=STATE_OK;
+                                return_code = STATE_OK;
                 }
                 break;
 
         case CHECK_USEDDISKSPACE:
 
-                if (value_list==NULL)
-                        output_message = strdup (_("missing -l parameters"));
-                else if (strlen(value_list)!=1)
-                        output_message = strdup (_("wrong -l argument"));
+                if (value_list == NULL)
+                        output_message = strdup(_("missing -l parameters"));
+                else if (strlen(value_list) != 1)
+                        output_message = strdup(_("wrong -l argument"));
                 else {
-                        xasprintf(&send_buffer,"%s&4&%s", req_password, value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        fds=strtok(recv_buffer,"&");
-                        tds=strtok(NULL,"&");
-                        if(fds!=NULL)
-                                free_disk_space=atof(fds);
-                        if(tds!=NULL)
-                                total_disk_space=atof(tds);
-
-                        if (total_disk_space>0 && free_disk_space>=0) {
+                        xasprintf(&send_buffer, "%s&4&%s", req_password, value_list);
+                        fetch_data(server_address, server_port, send_buffer);
+                        fds = strtok(recv_buffer, "&");
+                        tds = strtok(NULL, "&");
+                        if (fds != NULL)
+                                free_disk_space = atof(fds);
+                        if (tds != NULL)
+                                total_disk_space = atof(tds);
+
+                        if (total_disk_space > 0 && free_disk_space >= 0) {
                                 percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
                                 warning_used_space = ((float)warning_value / 100) * total_disk_space;
                                 critical_used_space = ((float)critical_value / 100) * total_disk_space;
 
-                                xasprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
-                                  value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
-                                  percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
-                                xasprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
-                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
-                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
+                                xasprintf(&temp_string, _("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"), value_list,
+                                                  total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824, percent_used_space,
+                                                  free_disk_space / 1073741824, (free_disk_space / total_disk_space) * 100);
+                                xasprintf(&temp_string_perf, _("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
+                                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+                                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
 
-                                if(check_critical_value && percent_used_space >= critical_value)
-                                        return_code=STATE_CRITICAL;
+                                if (check_critical_value && percent_used_space >= critical_value)
+                                        return_code = STATE_CRITICAL;
                                 else if (check_warning_value && percent_used_space >= warning_value)
-                                        return_code=STATE_WARNING;
+                                        return_code = STATE_WARNING;
                                 else
-                                        return_code=STATE_OK;
+                                        return_code = STATE_OK;
 
-                                output_message = strdup (temp_string);
+                                output_message = strdup(temp_string);
                                 perfdata = temp_string_perf;
                         } else {
-                                output_message = strdup (_("Free disk space : Invalid drive"));
-                                return_code=STATE_UNKNOWN;
+                                output_message = strdup(_("Free disk space : Invalid drive"));
+                                return_code = STATE_UNKNOWN;
                         }
                 }
                 break;
@@ -280,57 +276,56 @@ int main(int argc, char **argv){
         case CHECK_SERVICESTATE:
         case CHECK_PROCSTATE:
 
-                if (value_list==NULL)
-                        output_message = strdup (_("No service/process specified"));
+                if (value_list == NULL)
+                        output_message = strdup(_("No service/process specified"));
                 else {
-                        preparelist(value_list);                /* replace , between services with & to send the request */
-                        xasprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
-                                                         (show_all) ? "ShowAll" : "ShowFail",value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        numstr = strtok(recv_buffer,"&");
+                        preparelist(value_list); /* replace , between services with & to send the request */
+                        xasprintf(&send_buffer, "%s&%u&%s&%s", req_password, (vars_to_check == CHECK_SERVICESTATE) ? 5 : 6,
+                                          (show_all) ? "ShowAll" : "ShowFail", value_list);
+                        fetch_data(server_address, server_port, send_buffer);
+                        numstr = strtok(recv_buffer, "&");
                         if (numstr == NULL)
                                 die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                        return_code=atoi(numstr);
-                        temp_string=strtok(NULL,"&");
-                        output_message = strdup (temp_string);
+                        return_code = atoi(numstr);
+                        temp_string = strtok(NULL, "&");
+                        output_message = strdup(temp_string);
                 }
                 break;
 
         case CHECK_MEMUSE:
 
-                xasprintf(&send_buffer,"%s&7", req_password);
-                fetch_data (server_address, server_port, send_buffer);
-                numstr = strtok(recv_buffer,"&");
+                xasprintf(&send_buffer, "%s&7", req_password);
+                fetch_data(server_address, server_port, send_buffer);
+                numstr = strtok(recv_buffer, "&");
                 if (numstr == NULL)
                         die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                mem_commitLimit=atof(numstr);
-                numstr = strtok(NULL,"&");
+                mem_commitLimit = atof(numstr);
+                numstr = strtok(NULL, "&");
                 if (numstr == NULL)
                         die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                mem_commitByte=atof(numstr);
+                mem_commitByte = atof(numstr);
                 percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
                 warning_used_space = ((float)warning_value / 100) * mem_commitLimit;
                 critical_used_space = ((float)critical_value / 100) * mem_commitLimit;
 
                 /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here,
                 which equals RAM + Pagefiles. */
-                xasprintf(&output_message,_("Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"),
-                  mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space,
-                  (mem_commitLimit - mem_commitByte) / 1048567, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
-                xasprintf(&perfdata,_("'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567,
-                  warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567);
-
-                return_code=STATE_OK;
-                if(check_critical_value && percent_used_space >= critical_value)
-                        return_code=STATE_CRITICAL;
+                xasprintf(&output_message, _("Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"),
+                                  mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space, (mem_commitLimit - mem_commitByte) / 1048567,
+                                  (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+                xasprintf(&perfdata, _("'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567, warning_used_space / 1048567,
+                                  critical_used_space / 1048567, mem_commitLimit / 1048567);
+
+                return_code = STATE_OK;
+                if (check_critical_value && percent_used_space >= critical_value)
+                        return_code = STATE_CRITICAL;
                 else if (check_warning_value && percent_used_space >= warning_value)
-                        return_code=STATE_WARNING;
+                        return_code = STATE_WARNING;
 
                 break;
 
         case CHECK_COUNTER:
 
-
                 /*
                 CHECK_COUNTER has been modified to provide extensive perfdata information.
                 In order to do this, some modifications have been done to the code
@@ -353,311 +348,290 @@ int main(int argc, char **argv){
                 */
 
                 if (value_list == NULL)
-                        output_message = strdup (_("No counter specified"));
-                else
-                {
-                        preparelist (value_list);       /* replace , between services with & to send the request */
-                        isPercent = (strchr (value_list, '%') != NULL);
-
-                        strtok (value_list, "&");       /* burn the first parameters */
-                        description = strtok (NULL, "&");
-                        counter_unit = strtok (NULL, "&");
-                        xasprintf (&send_buffer, "%s&8&%s", req_password, value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        counter_value = atof (recv_buffer);
+                        output_message = strdup(_("No counter specified"));
+                else {
+                        preparelist(value_list); /* replace , between services with & to send the request */
+                        isPercent = (strchr(value_list, '%') != NULL);
+
+                        strtok(value_list, "&"); /* burn the first parameters */
+                        description = strtok(NULL, "&");
+                        counter_unit = strtok(NULL, "&");
+                        xasprintf(&send_buffer, "%s&8&%s", req_password, value_list);
+                        fetch_data(server_address, server_port, send_buffer);
+                        counter_value = atof(recv_buffer);
 
                         if (description == NULL)
-                        xasprintf (&output_message, "%.f", counter_value);
-                        else if (isPercent)
-                        {
-                                counter_unit = strdup ("%");
+                                xasprintf(&output_message, "%.f", counter_value);
+                        else if (isPercent) {
+                                counter_unit = strdup("%");
                                 allRight = true;
                         }
 
-                        if ((counter_unit != NULL) && (!allRight))
-                        {
-                                minval = strtok (NULL, "&");
-                                maxval = strtok (NULL, "&");
+                        if ((counter_unit != NULL) && (!allRight)) {
+                                minval = strtok(NULL, "&");
+                                maxval = strtok(NULL, "&");
 
                                 /* All parameters specified. Let's check the numbers */
 
-                                fminval = (minval != NULL) ? strtod (minval, &errcvt) : -1;
-                                fmaxval = (minval != NULL) ? strtod (maxval, &errcvt) : -1;
+                                fminval = (minval != NULL) ? strtod(minval, &errcvt) : -1;
+                                fmaxval = (minval != NULL) ? strtod(maxval, &errcvt) : -1;
 
                                 if ((fminval == 0) && (minval == errcvt))
-                                        output_message = strdup (_("Minimum value contains non-numbers"));
-                                else
-                                {
+                                        output_message = strdup(_("Minimum value contains non-numbers"));
+                                else {
                                         if ((fmaxval == 0) && (maxval == errcvt))
-                                                output_message = strdup (_("Maximum value contains non-numbers"));
+                                                output_message = strdup(_("Maximum value contains non-numbers"));
                                         else
-                                                allRight = true;        /* Everything is OK. */
-
+                                                allRight = true; /* Everything is OK. */
                                 }
-                        }
-                        else if ((counter_unit == NULL) && (description != NULL))
-                                output_message = strdup (_("No unit counter specified"));
+                        } else if ((counter_unit == NULL) && (description != NULL))
+                                output_message = strdup(_("No unit counter specified"));
 
-                        if (allRight)
-                        {
+                        if (allRight) {
                                 /* Let's format the output string, finally... */
-                                        if (strstr(description, "%") == NULL) {
-                                                xasprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
-                                        } else {
-                                                /* has formatting, will segv if wrong */
-                                                xasprintf (&output_message, description, counter_value);
-                                        }
-                                        xasprintf (&output_message, "%s |", output_message);
-                                        xasprintf (&output_message,"%s %s", output_message,
-                                                fperfdata (description, counter_value,
-                                                        counter_unit, 1, warning_value, 1, critical_value,
-                                                        (!(isPercent) && (minval != NULL)), fminval,
-                                                        (!(isPercent) && (minval != NULL)), fmaxval));
+                                if (strstr(description, "%") == NULL) {
+                                        xasprintf(&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+                                } else {
+                                        /* has formatting, will segv if wrong */
+                                        xasprintf(&output_message, description, counter_value);
+                                }
+                                xasprintf(&output_message, "%s |", output_message);
+                                xasprintf(&output_message, "%s %s", output_message,
+                                                  fperfdata(description, counter_value, counter_unit, 1, warning_value, 1, critical_value,
+                                                                        (!(isPercent) && (minval != NULL)), fminval, (!(isPercent) && (minval != NULL)), fmaxval));
                         }
                 }
 
-                if (critical_value > warning_value)
-                {                       /* Normal thresholds */
+                if (critical_value > warning_value) { /* Normal thresholds */
                         if (check_critical_value && counter_value >= critical_value)
                                 return_code = STATE_CRITICAL;
-                        else if (check_warning_value  && counter_value >= warning_value)
+                        else if (check_warning_value && counter_value >= warning_value)
                                 return_code = STATE_WARNING;
                         else
                                 return_code = STATE_OK;
-                }
-                else
-                {                       /* inverse thresholds */
+                } else { /* inverse thresholds */
                         return_code = STATE_OK;
                         if (check_critical_value && counter_value <= critical_value)
                                 return_code = STATE_CRITICAL;
                         else if (check_warning_value && counter_value <= warning_value)
                                 return_code = STATE_WARNING;
                 }
-        break;
+                break;
 
         case CHECK_FILEAGE:
 
-                if (value_list==NULL)
-                        output_message = strdup (_("No counter specified"));
+                if (value_list == NULL)
+                        output_message = strdup(_("No counter specified"));
                 else {
-                        preparelist(value_list);                /* replace , between services with & to send the request */
-                        xasprintf(&send_buffer,"%s&9&%s", req_password,value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        age_in_minutes = atoi(strtok(recv_buffer,"&"));
-                        description = strtok(NULL,"&");
-                        output_message = strdup (description);
-
-                        if (critical_value > warning_value) {        /* Normal thresholds */
-                                if(check_critical_value && age_in_minutes >= critical_value)
-                                        return_code=STATE_CRITICAL;
+                        preparelist(value_list); /* replace , between services with & to send the request */
+                        xasprintf(&send_buffer, "%s&9&%s", req_password, value_list);
+                        fetch_data(server_address, server_port, send_buffer);
+                        age_in_minutes = atoi(strtok(recv_buffer, "&"));
+                        description = strtok(NULL, "&");
+                        output_message = strdup(description);
+
+                        if (critical_value > warning_value) { /* Normal thresholds */
+                                if (check_critical_value && age_in_minutes >= critical_value)
+                                        return_code = STATE_CRITICAL;
                                 else if (check_warning_value && age_in_minutes >= warning_value)
-                                        return_code=STATE_WARNING;
+                                        return_code = STATE_WARNING;
                                 else
-                                        return_code=STATE_OK;
-                        }
-                        else {                                       /* inverse thresholds */
-                                if(check_critical_value && age_in_minutes <= critical_value)
-                                        return_code=STATE_CRITICAL;
+                                        return_code = STATE_OK;
+                        } else { /* inverse thresholds */
+                                if (check_critical_value && age_in_minutes <= critical_value)
+                                        return_code = STATE_CRITICAL;
                                 else if (check_warning_value && age_in_minutes <= warning_value)
-                                        return_code=STATE_WARNING;
+                                        return_code = STATE_WARNING;
                                 else
-                                        return_code=STATE_OK;
+                                        return_code = STATE_OK;
                         }
                 }
                 break;
 
         case CHECK_INSTANCES:
-                if (value_list==NULL)
-                        output_message = strdup (_("No counter specified"));
+                if (value_list == NULL)
+                        output_message = strdup(_("No counter specified"));
                 else {
-                        xasprintf(&send_buffer,"%s&10&%s", req_password,value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        if (!strncmp(recv_buffer,"ERROR",5)) {
-                                printf("NSClient - %s\n",recv_buffer);
+                        xasprintf(&send_buffer, "%s&10&%s", req_password, value_list);
+                        fetch_data(server_address, server_port, send_buffer);
+                        if (!strncmp(recv_buffer, "ERROR", 5)) {
+                                printf("NSClient - %s\n", recv_buffer);
                                 exit(STATE_UNKNOWN);
                         }
-                        xasprintf(&output_message,"%s",recv_buffer);
-                        return_code=STATE_OK;
+                        xasprintf(&output_message, "%s", recv_buffer);
+                        return_code = STATE_OK;
                 }
                 break;
 
         case CHECK_NONE:
         default:
-                usage4 (_("Please specify a variable to check"));
+                usage4(_("Please specify a variable to check"));
                 break;
-
         }
 
         /* reset timeout */
         alarm(0);
 
-        if (perfdata==NULL)
-                printf("%s\n",output_message);
+        if (perfdata == NULL)
+                printf("%s\n", output_message);
         else
-                printf("%s | %s\n",output_message,perfdata);
+                printf("%s | %s\n", output_message, perfdata);
         return return_code;
 }
 
-
-
 /* process command-line arguments */
-int process_arguments(int argc, char **argv){
+int process_arguments(int argc, char **argv) {
         int c;
 
         int option = 0;
-        static struct option longopts[] =
-        {
-                {"port",     required_argument,0,'p'},
-                {"timeout",  required_argument,0,'t'},
-                {"critical", required_argument,0,'c'},
-                {"warning",  required_argument,0,'w'},
-                {"variable", required_argument,0,'v'},
-                {"hostname", required_argument,0,'H'},
-                {"params",   required_argument,0,'l'},
-                {"secret",   required_argument,0,'s'},
-                {"display",  required_argument,0,'d'},
-                {"unknown-timeout", no_argument, 0, 'u'},
-                {"version",  no_argument,      0,'V'},
-                {"help",     no_argument,      0,'h'},
-                {0,0,0,0}
-        };
+        static struct option longopts[] = {{"port", required_argument, 0, 'p'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"variable", required_argument, 0, 'v'},
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"params", required_argument, 0, 'l'},
+                                                                           {"secret", required_argument, 0, 's'},
+                                                                           {"display", required_argument, 0, 'd'},
+                                                                           {"unknown-timeout", no_argument, 0, 'u'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
 
         /* no options were supplied */
-        if(argc<2) return ERROR;
+        if (argc < 2)
+                return ERROR;
 
         /* backwards compatibility */
-        if (! is_option(argv[1])) {
+        if (!is_option(argv[1])) {
                 server_address = strdup(argv[1]);
-                argv[1]=argv[0];
-                argv=&argv[1];
+                argv[1] = argv[0];
+                argv = &argv[1];
                 argc--;
         }
 
-        for (c=1;c<argc;c++) {
-                if(strcmp("-to",argv[c])==0)
-                        strcpy(argv[c],"-t");
-                else if (strcmp("-wv",argv[c])==0)
-                        strcpy(argv[c],"-w");
-                else if (strcmp("-cv",argv[c])==0)
-                        strcpy(argv[c],"-c");
+        for (c = 1; c < argc; c++) {
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+                else if (strcmp("-wv", argv[c]) == 0)
+                        strcpy(argv[c], "-w");
+                else if (strcmp("-cv", argv[c]) == 0)
+                        strcpy(argv[c], "-c");
         }
 
         while (1) {
-                c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:u",longopts,&option);
+                c = getopt_long(argc, argv, "+hVH:t:c:w:p:v:l:s:d:u", longopts, &option);
 
-                if (c==-1||c==EOF||c==1)
+                if (c == -1 || c == EOF || c == 1)
                         break;
 
                 switch (c) {
-                        case '?': /* print short usage statement if args not parsable */
-                        usage5 ();
-                        case 'h': /* help */
-                                print_help();
-                                exit(STATE_UNKNOWN);
-                        case 'V': /* version */
-                                print_revision(progname, NP_VERSION);
-                                exit(STATE_UNKNOWN);
-                        case 'H': /* hostname */
-                                server_address = optarg;
-                                break;
-                        case 's': /* password */
-                                req_password = optarg;
-                                break;
-                        case 'p': /* port */
-                                if (is_intnonneg(optarg))
-                                        server_port=atoi(optarg);
-                                else
-                                        die(STATE_UNKNOWN,_("Server port must be an integer\n"));
-                                break;
-                        case 'v':
-                                if(strlen(optarg)<4)
-                                        return ERROR;
-                                if(!strcmp(optarg,"CLIENTVERSION"))
-                                        vars_to_check=CHECK_CLIENTVERSION;
-                                else if(!strcmp(optarg,"CPULOAD"))
-                                        vars_to_check=CHECK_CPULOAD;
-                                else if(!strcmp(optarg,"UPTIME"))
-                                        vars_to_check=CHECK_UPTIME;
-                                else if(!strcmp(optarg,"USEDDISKSPACE"))
-                                        vars_to_check=CHECK_USEDDISKSPACE;
-                                else if(!strcmp(optarg,"SERVICESTATE"))
-                                        vars_to_check=CHECK_SERVICESTATE;
-                                else if(!strcmp(optarg,"PROCSTATE"))
-                                        vars_to_check=CHECK_PROCSTATE;
-                                else if(!strcmp(optarg,"MEMUSE"))
-                                        vars_to_check=CHECK_MEMUSE;
-                                else if(!strcmp(optarg,"COUNTER"))
-                                        vars_to_check=CHECK_COUNTER;
-                                else if(!strcmp(optarg,"FILEAGE"))
-                                        vars_to_check=CHECK_FILEAGE;
-                                else if(!strcmp(optarg,"INSTANCES"))
-                                        vars_to_check=CHECK_INSTANCES;
-                                else
-                                        return ERROR;
-                                break;
-                        case 'l': /* value list */
-                                value_list = optarg;
-                                break;
-                        case 'w': /* warning threshold */
-                                warning_value=strtoul(optarg,NULL,10);
-                                check_warning_value=true;
-                                break;
-                        case 'c': /* critical threshold */
-                                critical_value=strtoul(optarg,NULL,10);
-                                check_critical_value=true;
-                                break;
-                        case 'd': /* Display select for services */
-                                if (!strcmp(optarg,"SHOWALL"))
-                                        show_all = true;
-                                break;
-                        case 'u':
-                                socket_timeout_state=STATE_UNKNOWN;
-                                break;
-                        case 't': /* timeout */
-                                socket_timeout=atoi(optarg);
-                                if(socket_timeout<=0)
-                                        return ERROR;
-                        }
-
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'H': /* hostname */
+                        server_address = optarg;
+                        break;
+                case 's': /* password */
+                        req_password = optarg;
+                        break;
+                case 'p': /* port */
+                        if (is_intnonneg(optarg))
+                                server_port = atoi(optarg);
+                        else
+                                die(STATE_UNKNOWN, _("Server port must be an integer\n"));
+                        break;
+                case 'v':
+                        if (strlen(optarg) < 4)
+                                return ERROR;
+                        if (!strcmp(optarg, "CLIENTVERSION"))
+                                vars_to_check = CHECK_CLIENTVERSION;
+                        else if (!strcmp(optarg, "CPULOAD"))
+                                vars_to_check = CHECK_CPULOAD;
+                        else if (!strcmp(optarg, "UPTIME"))
+                                vars_to_check = CHECK_UPTIME;
+                        else if (!strcmp(optarg, "USEDDISKSPACE"))
+                                vars_to_check = CHECK_USEDDISKSPACE;
+                        else if (!strcmp(optarg, "SERVICESTATE"))
+                                vars_to_check = CHECK_SERVICESTATE;
+                        else if (!strcmp(optarg, "PROCSTATE"))
+                                vars_to_check = CHECK_PROCSTATE;
+                        else if (!strcmp(optarg, "MEMUSE"))
+                                vars_to_check = CHECK_MEMUSE;
+                        else if (!strcmp(optarg, "COUNTER"))
+                                vars_to_check = CHECK_COUNTER;
+                        else if (!strcmp(optarg, "FILEAGE"))
+                                vars_to_check = CHECK_FILEAGE;
+                        else if (!strcmp(optarg, "INSTANCES"))
+                                vars_to_check = CHECK_INSTANCES;
+                        else
+                                return ERROR;
+                        break;
+                case 'l': /* value list */
+                        value_list = optarg;
+                        break;
+                case 'w': /* warning threshold */
+                        warning_value = strtoul(optarg, NULL, 10);
+                        check_warning_value = true;
+                        break;
+                case 'c': /* critical threshold */
+                        critical_value = strtoul(optarg, NULL, 10);
+                        check_critical_value = true;
+                        break;
+                case 'd': /* Display select for services */
+                        if (!strcmp(optarg, "SHOWALL"))
+                                show_all = true;
+                        break;
+                case 'u':
+                        socket_timeout_state = STATE_UNKNOWN;
+                        break;
+                case 't': /* timeout */
+                        socket_timeout = atoi(optarg);
+                        if (socket_timeout <= 0)
+                                return ERROR;
+                }
         }
         if (server_address == NULL)
-                usage4 (_("You must provide a server address or host name"));
+                usage4(_("You must provide a server address or host name"));
 
-        if (vars_to_check==CHECK_NONE)
+        if (vars_to_check == CHECK_NONE)
                 return ERROR;
 
         if (req_password == NULL)
-                req_password = strdup (_("None"));
+                req_password = strdup(_("None"));
 
         return OK;
 }
 
-
-
-void fetch_data (const char *address, int port, const char *sendb) {
+void fetch_data(const char *address, int port, const char *sendb) {
         int result;
 
-        result=process_tcp_request(address, port, sendb, recv_buffer,sizeof(recv_buffer));
+        result = process_tcp_request(address, port, sendb, recv_buffer, sizeof(recv_buffer));
 
-        if(result!=STATE_OK)
-                die (result, _("could not fetch information from server\n"));
+        if (result != STATE_OK)
+                die(result, _("could not fetch information from server\n"));
 
-        if (!strncmp(recv_buffer,"ERROR",5))
-                die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer);
+        if (!strncmp(recv_buffer, "ERROR", 5))
+                die(STATE_UNKNOWN, "NSClient - %s\n", recv_buffer);
 }
 
 bool strtoularray(unsigned long *array, char *string, const char *delim) {
         /* split a <delim> delimited string into a long array */
-        int idx=0;
+        int idx = 0;
         char *t1;
 
-        for (idx=0;idx<MAX_VALUE_LIST;idx++)
-                array[idx]=0;
+        for (idx = 0; idx < MAX_VALUE_LIST; idx++)
+                array[idx] = 0;
 
-        idx=0;
-        for(t1 = strtok(string,delim);t1 != NULL; t1 = strtok(NULL, delim)) {
-                if (is_numeric(t1) && idx<MAX_VALUE_LIST) {
-                        array[idx]=strtoul(t1,NULL,10);
+        idx = 0;
+        for (t1 = strtok(string, delim); t1 != NULL; t1 = strtok(NULL, delim)) {
+                if (is_numeric(t1) && idx < MAX_VALUE_LIST) {
+                        array[idx] = strtoul(t1, NULL, 10);
                         idx++;
                 } else
                         return false;
@@ -671,131 +645,124 @@ void preparelist(char *string) {
 
         for (i = 0; (size_t)i < strlen(string); i++)
                 if (string[i] == ',') {
-                        string[i]='&';
+                        string[i] = '&';
                 }
 }
 
-
-
-void print_help(void)
-{
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin collects data from the NSClient service running on a"));
-        printf ("%s\n", _("Windows NT/2000/XP/2003 server."));
+        printf("%s\n", _("This plugin collects data from the NSClient service running on a"));
+        printf("%s\n", _("Windows NT/2000/XP/2003 server."));
 
-        printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf ("%s\n", _("Options:"));
-        printf (" %s\n", "-H, --hostname=HOST");
-        printf ("   %s\n", _("Name of the host to check"));
-        printf (" %s\n", "-p, --port=INTEGER");
-        printf ("   %s", _("Optional port number (default: "));
-        printf ("%d)\n", PORT);
-        printf (" %s\n", "-s, --secret=<password>");
-        printf ("   %s\n", _("Password needed for the request"));
-        printf (" %s\n", "-w, --warning=INTEGER");
-        printf ("   %s\n", _("Threshold which will result in a warning status"));
-        printf (" %s\n", "-c, --critical=INTEGER");
-        printf ("   %s\n", _("Threshold which will result in a critical status"));
-        printf (" %s\n", "-t, --timeout=INTEGER");
-        printf ("   %s", _("Seconds before connection attempt times out (default: "));
-        printf (" %s\n", "-l, --params=<parameters>");
-        printf ("   %s", _("Parameters passed to specified check (see below)"));
-        printf (" %s\n", "-d, --display={SHOWALL}");
-        printf ("   %s", _("Display options (currently only SHOWALL works)"));
-        printf (" %s\n", "-u, --unknown-timeout");
-        printf ("   %s", _("Return UNKNOWN on timeouts"));
-        printf ("%d)\n", DEFAULT_SOCKET_TIMEOUT);
-        printf (" %s\n", "-h, --help");
-        printf ("   %s\n", _("Print this help screen"));
-        printf (" %s\n", "-V, --version");
-        printf ("   %s\n", _("Print version information"));
-        printf (" %s\n", "-v, --variable=STRING");
-        printf ("   %s\n\n", _("Variable to check"));
-        printf ("%s\n", _("Valid variables are:"));
-        printf (" %s", "CLIENTVERSION =");
-        printf (" %s\n", _("Get the NSClient version"));
-        printf ("  %s\n", _("If -l <version> is specified, will return warning if versions differ."));
-        printf (" %s\n", "CPULOAD =");
-        printf ("  %s\n", _("Average CPU load on last x minutes."));
-        printf ("  %s\n", _("Request a -l parameter with the following syntax:"));
-        printf ("  %s\n", _("-l <minutes range>,<warning threshold>,<critical threshold>."));
-        printf ("  %s\n", _("<minute range> should be less than 24*60."));
-        printf ("  %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot."));
-        printf ("  %s\n", "ie: -l 60,90,95,120,90,95");
-        printf (" %s\n", "UPTIME =");
-        printf ("  %s\n", _("Get the uptime of the machine."));
-        printf ("  %s\n", _("-l <unit> "));
-        printf ("  %s\n", _("<unit> = seconds, minutes, hours, or days. (default: minutes)"));
-        printf ("  %s\n", _("Thresholds will use the unit specified above."));
-        printf (" %s\n", "USEDDISKSPACE =");
-        printf ("  %s\n", _("Size and percentage of disk use."));
-        printf ("  %s\n", _("Request a -l parameter containing the drive letter only."));
-        printf ("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
-        printf (" %s\n", "MEMUSE =");
-        printf ("  %s\n", _("Memory use."));
-        printf ("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
-        printf (" %s\n", "SERVICESTATE =");
-        printf ("  %s\n", _("Check the state of one or several services."));
-        printf ("  %s\n", _("Request a -l parameters with the following syntax:"));
-        printf ("  %s\n", _("-l <service1>,<service2>,<service3>,..."));
-        printf ("  %s\n", _("You can specify -d SHOWALL in case you want to see working services"));
-        printf ("  %s\n", _("in the returned string."));
-        printf (" %s\n", "PROCSTATE =");
-        printf ("  %s\n", _("Check if one or several process are running."));
-        printf ("  %s\n", _("Same syntax as SERVICESTATE."));
-        printf (" %s\n", "COUNTER =");
-        printf ("  %s\n", _("Check any performance counter of Windows NT/2000."));
-        printf ("       %s\n", _("Request a -l parameters with the following syntax:"));
-        printf ("       %s\n", _("-l \"\\\\<performance object>\\\\counter\",\"<description>"));
-        printf ("       %s\n", _("The <description> parameter is optional and is given to a printf "));
-        printf ("  %s\n", _("output command which requires a float parameter."));
-        printf ("  %s\n", _("If <description> does not include \"%%\", it is used as a label."));
-        printf ("  %s\n", _("Some examples:"));
-        printf ("  %s\n", "\"Paging file usage is %%.2f %%%%\"");
-        printf ("  %s\n", "\"%%.f %%%% paging file used.\"");
-        printf (" %s\n", "INSTANCES =");
-        printf ("  %s\n", _("Check any performance counter object of Windows NT/2000."));
-        printf ("  %s\n", _("Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"));
-        printf ("  %s\n", _("<counter object> is a Windows Perfmon Counter object (eg. Process),"));
-        printf ("  %s\n", _("if it is two words, it should be enclosed in quotes"));
-        printf ("  %s\n", _("The returned results will be a comma-separated list of instances on "));
-        printf ("  %s\n", _(" the selected computer for that object."));
-        printf ("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
-        printf ("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
-        printf ("  %s\n", _("  to run Perfmon directly."));
-        printf ("  %s\n", _("It can also be used in scripts that automatically create the monitoring service"));
-        printf ("  %s\n", _(" configuration files."));
-        printf ("  %s\n", _("Some examples:"));
-        printf ("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
-
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("- The NSClient service should be running on the server to get any information"));
-        printf ("   %s\n", "(http://nsclient.ready2run.nl).");
-        printf (" %s\n", _("- Critical thresholds should be lower than warning thresholds"));
-        printf (" %s\n", _("- Default port 1248 is sometimes in use by other services. The error"));
-        printf ("   %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\"."));
-        printf ("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
-        printf ("   %s\n", _("and on the client service it\'s connecting to."));
-
-        printf (UT_SUPPORT);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf("%s\n", _("Options:"));
+        printf(" %s\n", "-H, --hostname=HOST");
+        printf("   %s\n", _("Name of the host to check"));
+        printf(" %s\n", "-p, --port=INTEGER");
+        printf("   %s", _("Optional port number (default: "));
+        printf("%d)\n", PORT);
+        printf(" %s\n", "-s, --secret=<password>");
+        printf("   %s\n", _("Password needed for the request"));
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("   %s\n", _("Threshold which will result in a warning status"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("   %s\n", _("Threshold which will result in a critical status"));
+        printf(" %s\n", "-t, --timeout=INTEGER");
+        printf("   %s", _("Seconds before connection attempt times out (default: "));
+        printf(" %s\n", "-l, --params=<parameters>");
+        printf("   %s", _("Parameters passed to specified check (see below)"));
+        printf(" %s\n", "-d, --display={SHOWALL}");
+        printf("   %s", _("Display options (currently only SHOWALL works)"));
+        printf(" %s\n", "-u, --unknown-timeout");
+        printf("   %s", _("Return UNKNOWN on timeouts"));
+        printf("%d)\n", DEFAULT_SOCKET_TIMEOUT);
+        printf(" %s\n", "-h, --help");
+        printf("   %s\n", _("Print this help screen"));
+        printf(" %s\n", "-V, --version");
+        printf("   %s\n", _("Print version information"));
+        printf(" %s\n", "-v, --variable=STRING");
+        printf("   %s\n\n", _("Variable to check"));
+        printf("%s\n", _("Valid variables are:"));
+        printf(" %s", "CLIENTVERSION =");
+        printf(" %s\n", _("Get the NSClient version"));
+        printf("  %s\n", _("If -l <version> is specified, will return warning if versions differ."));
+        printf(" %s\n", "CPULOAD =");
+        printf("  %s\n", _("Average CPU load on last x minutes."));
+        printf("  %s\n", _("Request a -l parameter with the following syntax:"));
+        printf("  %s\n", _("-l <minutes range>,<warning threshold>,<critical threshold>."));
+        printf("  %s\n", _("<minute range> should be less than 24*60."));
+        printf("  %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot."));
+        printf("  %s\n", "ie: -l 60,90,95,120,90,95");
+        printf(" %s\n", "UPTIME =");
+        printf("  %s\n", _("Get the uptime of the machine."));
+        printf("  %s\n", _("-l <unit> "));
+        printf("  %s\n", _("<unit> = seconds, minutes, hours, or days. (default: minutes)"));
+        printf("  %s\n", _("Thresholds will use the unit specified above."));
+        printf(" %s\n", "USEDDISKSPACE =");
+        printf("  %s\n", _("Size and percentage of disk use."));
+        printf("  %s\n", _("Request a -l parameter containing the drive letter only."));
+        printf("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
+        printf(" %s\n", "MEMUSE =");
+        printf("  %s\n", _("Memory use."));
+        printf("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
+        printf(" %s\n", "SERVICESTATE =");
+        printf("  %s\n", _("Check the state of one or several services."));
+        printf("  %s\n", _("Request a -l parameters with the following syntax:"));
+        printf("  %s\n", _("-l <service1>,<service2>,<service3>,..."));
+        printf("  %s\n", _("You can specify -d SHOWALL in case you want to see working services"));
+        printf("  %s\n", _("in the returned string."));
+        printf(" %s\n", "PROCSTATE =");
+        printf("  %s\n", _("Check if one or several process are running."));
+        printf("  %s\n", _("Same syntax as SERVICESTATE."));
+        printf(" %s\n", "COUNTER =");
+        printf("  %s\n", _("Check any performance counter of Windows NT/2000."));
+        printf("        %s\n", _("Request a -l parameters with the following syntax:"));
+        printf("        %s\n", _("-l \"\\\\<performance object>\\\\counter\",\"<description>"));
+        printf("        %s\n", _("The <description> parameter is optional and is given to a printf "));
+        printf("  %s\n", _("output command which requires a float parameter."));
+        printf("  %s\n", _("If <description> does not include \"%%\", it is used as a label."));
+        printf("  %s\n", _("Some examples:"));
+        printf("  %s\n", "\"Paging file usage is %%.2f %%%%\"");
+        printf("  %s\n", "\"%%.f %%%% paging file used.\"");
+        printf(" %s\n", "INSTANCES =");
+        printf("  %s\n", _("Check any performance counter object of Windows NT/2000."));
+        printf("  %s\n", _("Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"));
+        printf("  %s\n", _("<counter object> is a Windows Perfmon Counter object (eg. Process),"));
+        printf("  %s\n", _("if it is two words, it should be enclosed in quotes"));
+        printf("  %s\n", _("The returned results will be a comma-separated list of instances on "));
+        printf("  %s\n", _(" the selected computer for that object."));
+        printf("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
+        printf("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
+        printf("  %s\n", _("  to run Perfmon directly."));
+        printf("  %s\n", _("It can also be used in scripts that automatically create the monitoring service"));
+        printf("  %s\n", _(" configuration files."));
+        printf("  %s\n", _("Some examples:"));
+        printf("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
+
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("- The NSClient service should be running on the server to get any information"));
+        printf("   %s\n", "(http://nsclient.ready2run.nl).");
+        printf(" %s\n", _("- Critical thresholds should be lower than warning thresholds"));
+        printf(" %s\n", _("- Default port 1248 is sometimes in use by other services. The error"));
+        printf("   %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\"."));
+        printf("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
+        printf("   %s\n", _("and on the client service it\'s connecting to."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void print_usage(void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -H host -v variable [-p port] [-w warning] [-c critical]\n",progname);
-        printf ("[-l params] [-d SHOWALL] [-u] [-t timeout]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host -v variable [-p port] [-w warning] [-c critical]\n", progname);
+        printf("[-l params] [-d SHOWALL] [-u] [-t timeout]\n");
 }
-
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 61b2d69..55a4946 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -4,7 +4,7 @@
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
+* Copyright (c) 2006-2024 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 *****************************************************************************/
 
 const char *progname = "check_ntp";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 464a9e1..f99e503 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -1,88 +1,88 @@
 /*****************************************************************************
-* 
-* Monitoring check_ntp_peer plugin
-* 
-* License: GPL
-* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ntp_peer plugin
-* 
-* This plugin checks an NTP server independent of any commandline
-* programs or external libraries.
-* 
-* Use this plugin to check the health of an NTP server. It supports
-* checking the offset with the sync peer, the jitter and stratum. This
-* plugin will not check the clock offset between the local host and NTP
-* server; please use check_ntp_time for that purpose.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_ntp_peer plugin
+ *
+ * License: GPL
+ * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
+ * Copyright (c) 2006-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ntp_peer plugin
+ *
+ * This plugin checks an NTP server independent of any commandline
+ * programs or external libraries.
+ *
+ * Use this plugin to check the health of an NTP server. It supports
+ * checking the offset with the sync peer, the jitter and stratum. This
+ * plugin will not check the clock offset between the local host and NTP
+ * server; please use check_ntp_time for that purpose.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_ntp_peer";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 
-static char *server_address=NULL;
-static int port=123;
-static int verbose=0;
+static char *server_address = NULL;
+static int port = 123;
+static int verbose = 0;
 static bool quiet = false;
-static char *owarn="60";
-static char *ocrit="120";
+static char *owarn = "60";
+static char *ocrit = "120";
 static bool do_stratum = false;
-static char *swarn="-1:16";
-static char *scrit="-1:16";
+static char *swarn = "-1:16";
+static char *scrit = "-1:16";
 static bool do_jitter = false;
-static char *jwarn="-1:5000";
-static char *jcrit="-1:10000";
+static char *jwarn = "-1:5000";
+static char *jcrit = "-1:10000";
 static bool do_truechimers = false;
-static char *twarn="0:";
-static char *tcrit="0:";
+static char *twarn = "0:";
+static char *tcrit = "0:";
 static bool syncsource_found = false;
 static bool li_alarm = false;
 
-int process_arguments (int, char **);
-thresholds *offset_thresholds = NULL;
-thresholds *jitter_thresholds = NULL;
-thresholds *stratum_thresholds = NULL;
-thresholds *truechimer_thresholds = NULL;
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static thresholds *offset_thresholds = NULL;
+static thresholds *jitter_thresholds = NULL;
+static thresholds *stratum_thresholds = NULL;
+static thresholds *truechimer_thresholds = NULL;
+static void print_help(void);
+void print_usage(void);
 
 /* max size of control message data */
 #define MAX_CM_SIZE 468
 
 /* this structure holds everything in an ntp control message as per rfc1305 */
 typedef struct {
-        uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
-        uint8_t op;          /* R,E,M bits and Opcode */
-        uint16_t seq;        /* Packet sequence */
-        uint16_t status;     /* Clock status */
-        uint16_t assoc;      /* Association */
-        uint16_t offset;     /* Similar to TCP sequence # */
-        uint16_t count;      /* # bytes of data */
+        uint8_t flags;          /* byte with leapindicator,vers,mode. see macros */
+        uint8_t op;             /* R,E,M bits and Opcode */
+        uint16_t seq;           /* Packet sequence */
+        uint16_t status;        /* Clock status */
+        uint16_t assoc;         /* Association */
+        uint16_t offset;        /* Similar to TCP sequence # */
+        uint16_t count;         /* # bytes of data */
         char data[MAX_CM_SIZE]; /* ASCII data of the request */
-                                /* NB: not necessarily NULL terminated! */
+                                                        /* NB: not necessarily NULL terminated! */
 } ntp_control_message;
 
 /* this is an association/status-word pair found in control packet responses */
@@ -93,82 +93,96 @@ typedef struct {
 
 /* bits 1,2 are the leap indicator */
 #define LI_MASK 0xc0
-#define LI(x) ((x&LI_MASK)>>6)
-#define LI_SET(x,y) do{ x |= ((y<<6)&LI_MASK); }while(0)
+#define LI(x)   ((x & LI_MASK) >> 6)
+#define LI_SET(x, y)                                                                                                                       \
+        do {                                                                                                                                   \
+                x |= ((y << 6) & LI_MASK);                                                                                                         \
+        } while (0)
 /* and these are the values of the leap indicator */
-#define LI_NOWARNING 0x00
-#define LI_EXTRASEC 0x01
+#define LI_NOWARNING  0x00
+#define LI_EXTRASEC   0x01
 #define LI_MISSINGSEC 0x02
-#define LI_ALARM 0x03
+#define LI_ALARM      0x03
 /* bits 3,4,5 are the ntp version */
 #define VN_MASK 0x38
-#define VN(x)   ((x&VN_MASK)>>3)
-#define VN_SET(x,y)     do{ x |= ((y<<3)&VN_MASK); }while(0)
+#define VN(x)   ((x & VN_MASK) >> 3)
+#define VN_SET(x, y)                                                                                                                       \
+        do {                                                                                                                                   \
+                x |= ((y << 3) & VN_MASK);                                                                                                         \
+        } while (0)
 #define VN_RESERVED 0x02
 /* bits 6,7,8 are the ntp mode */
 #define MODE_MASK 0x07
-#define MODE(x) (x&MODE_MASK)
-#define MODE_SET(x,y)   do{ x |= (y&MODE_MASK); }while(0)
+#define MODE(x)   (x & MODE_MASK)
+#define MODE_SET(x, y)                                                                                                                     \
+        do {                                                                                                                                   \
+                x |= (y & MODE_MASK);                                                                                                              \
+        } while (0)
 /* here are some values */
-#define MODE_CLIENT 0x03
+#define MODE_CLIENT     0x03
 #define MODE_CONTROLMSG 0x06
 /* In control message, bits 8-10 are R,E,M bits */
-#define REM_MASK 0xe0
-#define REM_RESP 0x80
+#define REM_MASK  0xe0
+#define REM_RESP  0x80
 #define REM_ERROR 0x40
-#define REM_MORE 0x20
+#define REM_MORE  0x20
 /* In control message, bits 11 - 15 are opcode */
 #define OP_MASK 0x1f
-#define OP_SET(x,y)   do{ x |= (y&OP_MASK); }while(0)
+#define OP_SET(x, y)                                                                                                                       \
+        do {                                                                                                                                   \
+                x |= (y & OP_MASK);                                                                                                                \
+        } while (0)
 #define OP_READSTAT 0x01
 #define OP_READVAR  0x02
 /* In peer status bytes, bits 6,7,8 determine clock selection status */
-#define PEER_SEL(x) ((ntohs(x)>>8)&0x07)
+#define PEER_SEL(x)     ((ntohs(x) >> 8) & 0x07)
 #define PEER_TRUECHIMER 0x02
-#define PEER_INCLUDED 0x04
+#define PEER_INCLUDED   0x04
 #define PEER_SYNCSOURCE 0x06
 
 /* NTP control message header is 12 bytes, plus any data in the data
  * field, plus null padding to the nearest 32-bit boundary per rfc.
  */
-#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0))
+#define SIZEOF_NTPCM(m) (12 + ntohs(m.count) + ((ntohs(m.count) % 4) ? 4 - (ntohs(m.count) % 4) : 0))
 
 /* finally, a little helper or two for debugging: */
-#define DBG(x) do{if(verbose>1){ x; }}while(0);
-#define PRINTSOCKADDR(x) \
-        do{ \
-                printf("%u.%u.%u.%u", (x>>24)&0xff, (x>>16)&0xff, (x>>8)&0xff, x&0xff);\
-        }while(0);
-
-void print_ntp_control_message(const ntp_control_message *p){
-        int i=0, numpeers=0;
-        const ntp_assoc_status_pair *peer=NULL;
-
+#define DBG(x)                                                                                                                             \
+        do {                                                                                                                                   \
+                if (verbose > 1) {                                                                                                                 \
+                        x;                                                                                                                             \
+                }                                                                                                                                  \
+        } while (0);
+#define PRINTSOCKADDR(x)                                                                                                                   \
+        do {                                                                                                                                   \
+                printf("%u.%u.%u.%u", (x >> 24) & 0xff, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);                                              \
+        } while (0);
+
+void print_ntp_control_message(const ntp_control_message *p) {
         printf("control packet contents:\n");
         printf("\tflags: 0x%.2x , 0x%.2x\n", p->flags, p->op);
-        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags&LI_MASK);
-        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags&VN_MASK);
-        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags&MODE_MASK);
-        printf("\t  response=%d (0x%.2x)\n", (p->op&REM_RESP)>0, p->op&REM_RESP);
-        printf("\t  more=%d (0x%.2x)\n", (p->op&REM_MORE)>0, p->op&REM_MORE);
-        printf("\t  error=%d (0x%.2x)\n", (p->op&REM_ERROR)>0, p->op&REM_ERROR);
-        printf("\t  op=%d (0x%.2x)\n", p->op&OP_MASK, p->op&OP_MASK);
+        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags & LI_MASK);
+        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags & VN_MASK);
+        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags & MODE_MASK);
+        printf("\t  response=%d (0x%.2x)\n", (p->op & REM_RESP) > 0, p->op & REM_RESP);
+        printf("\t  more=%d (0x%.2x)\n", (p->op & REM_MORE) > 0, p->op & REM_MORE);
+        printf("\t  error=%d (0x%.2x)\n", (p->op & REM_ERROR) > 0, p->op & REM_ERROR);
+        printf("\t  op=%d (0x%.2x)\n", p->op & OP_MASK, p->op & OP_MASK);
         printf("\tsequence: %d (0x%.2x)\n", ntohs(p->seq), ntohs(p->seq));
         printf("\tstatus: %d (0x%.2x)\n", ntohs(p->status), ntohs(p->status));
         printf("\tassoc: %d (0x%.2x)\n", ntohs(p->assoc), ntohs(p->assoc));
         printf("\toffset: %d (0x%.2x)\n", ntohs(p->offset), ntohs(p->offset));
         printf("\tcount: %d (0x%.2x)\n", ntohs(p->count), ntohs(p->count));
-        numpeers=ntohs(p->count)/(sizeof(ntp_assoc_status_pair));
-        if(p->op&REM_RESP && p->op&OP_READSTAT){
-                peer=(ntp_assoc_status_pair*)p->data;
-                for(i=0;i<numpeers;i++){
-                        printf("\tpeer id %.2x status %.2x",
-                               ntohs(peer[i].assoc), ntohs(peer[i].status));
-                        if(PEER_SEL(peer[i].status) >= PEER_SYNCSOURCE){
+
+        int numpeers = ntohs(p->count) / (sizeof(ntp_assoc_status_pair));
+        if (p->op & REM_RESP && p->op & OP_READSTAT) {
+                const ntp_assoc_status_pair *peer = (ntp_assoc_status_pair *)p->data;
+                for (int i = 0; i < numpeers; i++) {
+                        printf("\tpeer id %.2x status %.2x", ntohs(peer[i].assoc), ntohs(peer[i].status));
+                        if (PEER_SEL(peer[i].status) >= PEER_SYNCSOURCE) {
                                 printf(" <-- current sync source");
-                        } else if(PEER_SEL(peer[i].status) >= PEER_INCLUDED){
+                        } else if (PEER_SEL(peer[i].status) >= PEER_INCLUDED) {
                                 printf(" <-- current sync candidate");
-                        } else if(PEER_SEL(peer[i].status) >= PEER_TRUECHIMER){
+                        } else if (PEER_SEL(peer[i].status) >= PEER_TRUECHIMER) {
                                 printf(" <-- outlyer, but truechimer");
                         }
                         printf("\n");
@@ -176,8 +190,7 @@ void print_ntp_control_message(const ntp_control_message *p){
         }
 }
 
-void
-setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
+void setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq) {
         memset(p, 0, sizeof(ntp_control_message));
         LI_SET(p->flags, LI_NOWARNING);
         VN_SET(p->flags, VN_RESERVED);
@@ -198,19 +211,7 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
  *  status is pretty much useless as syncsource_found is a global variable
  *  used later in main to check is the server was synchronized. It works
  *  so I left it alone */
-int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum, int *num_truechimers){
-        int conn=-1, i, npeers=0, num_candidates=0;
-        double tmp_offset = 0;
-        int min_peer_sel=PEER_INCLUDED;
-        int peers_size=0, peer_offset=0;
-        int status;
-        ntp_assoc_status_pair *peers=NULL;
-        ntp_control_message req;
-        const char *getvar = "stratum,offset,jitter";
-        char *data, *value, *nptr;
-        void *tmp;
-
-        status = STATE_OK;
+int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum, int *num_truechimers) {
         *offset_result = STATE_UNKNOWN;
         *jitter = *stratum = -1;
         *num_truechimers = 0;
@@ -231,11 +232,20 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
          * 4) Extract the offset, jitter and stratum value from the data[]
          *    (it's ASCII)
          */
+        int min_peer_sel = PEER_INCLUDED;
+        int num_candidates = 0;
+        void *tmp;
+        ntp_assoc_status_pair *peers = NULL;
+        int peer_offset = 0;
+        int peers_size = 0;
+        int npeers = 0;
+        int conn = -1;
         my_udp_connect(server_address, port, &conn);
 
         /* keep sending requests until the server stops setting the
          * REM_MORE bit, though usually this is only 1 packet. */
-        do{
+        ntp_control_message req;
+        do {
                 setup_control_request(&req, OP_READSTAT, 1);
                 DBG(printf("sending READSTAT request"));
                 write(conn, &req, SIZEOF_NTPCM(req));
@@ -243,63 +253,73 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
 
                 do {
                         /* Attempt to read the largest size packet possible */
-                        req.count=htons(MAX_CM_SIZE);
+                        req.count = htons(MAX_CM_SIZE);
                         DBG(printf("receiving READSTAT response"))
-                        if(read(conn, &req, SIZEOF_NTPCM(req)) == -1)
+                        if (read(conn, &req, SIZEOF_NTPCM(req)) == -1)
                                 die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
                         DBG(print_ntp_control_message(&req));
                         /* discard obviously invalid packets */
                         if (ntohs(req.count) > MAX_CM_SIZE)
                                 die(STATE_CRITICAL, "NTP CRITICAL: Invalid packet received from NTP server\n");
-                } while (!(req.op&OP_READSTAT && ntohs(req.seq) == 1));
+                } while (!(req.op & OP_READSTAT && ntohs(req.seq) == 1));
 
-                if (LI(req.flags) == LI_ALARM) li_alarm = true;
+                if (LI(req.flags) == LI_ALARM)
+                        li_alarm = true;
                 /* Each peer identifier is 4 bytes in the data section, which
-                 * we represent as a ntp_assoc_status_pair datatype.
-                 */
-                peers_size+=ntohs(req.count);
-                if((tmp=realloc(peers, peers_size)) == NULL)
+                 * we represent as a ntp_assoc_status_pair datatype.
+                 */
+                peers_size += ntohs(req.count);
+                if ((tmp = realloc(peers, peers_size)) == NULL)
                         free(peers), die(STATE_UNKNOWN, "can not (re)allocate 'peers' buffer\n");
-                peers=tmp;
-                memcpy((void*)((ptrdiff_t)peers+peer_offset), (void*)req.data, ntohs(req.count));
-                npeers=peers_size/sizeof(ntp_assoc_status_pair);
-                peer_offset+=ntohs(req.count);
-        } while(req.op&REM_MORE);
+                peers = tmp;
+                memcpy((void *)((ptrdiff_t)peers + peer_offset), (void *)req.data, ntohs(req.count));
+                npeers = peers_size / sizeof(ntp_assoc_status_pair);
+                peer_offset += ntohs(req.count);
+        } while (req.op & REM_MORE);
 
         /* first, let's find out if we have a sync source, or if there are
          * at least some candidates. In the latter case we'll issue
          * a warning but go ahead with the check on them. */
-        for (i = 0; i < npeers; i++){
-                if(PEER_SEL(peers[i].status) >= PEER_TRUECHIMER){
+        for (int i = 0; i < npeers; i++) {
+                if (PEER_SEL(peers[i].status) >= PEER_TRUECHIMER) {
                         (*num_truechimers)++;
-                        if(PEER_SEL(peers[i].status) >= PEER_INCLUDED){
+                        if (PEER_SEL(peers[i].status) >= PEER_INCLUDED) {
                                 num_candidates++;
-                                if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){
+                                if (PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE) {
                                         syncsource_found = true;
-                                        min_peer_sel=PEER_SYNCSOURCE;
+                                        min_peer_sel = PEER_SYNCSOURCE;
                                 }
                         }
                 }
         }
-        if(verbose) printf("%d candidate peers available\n", num_candidates);
-        if(verbose && syncsource_found) printf("synchronization source found\n");
-        if(! syncsource_found){
+
+        if (verbose)
+                printf("%d candidate peers available\n", num_candidates);
+        if (verbose && syncsource_found)
+                printf("synchronization source found\n");
+
+        int status = STATE_OK;
+        if (!syncsource_found) {
                 status = STATE_WARNING;
-                if(verbose) printf("warning: no synchronization source found\n");
+                if (verbose)
+                        printf("warning: no synchronization source found\n");
         }
-        if(li_alarm){
+        if (li_alarm) {
                 status = STATE_WARNING;
-                if(verbose) printf("warning: LI_ALARM bit is set\n");
+                if (verbose)
+                        printf("warning: LI_ALARM bit is set\n");
         }
 
-
-        for (i = 0; i < npeers; i++){
+        const char *getvar = "stratum,offset,jitter";
+        char *data;
+        for (int i = 0; i < npeers; i++) {
                 /* Only query this server if it is the current sync source */
                 /* If there's no sync.peer, query all candidates and use the best one */
-                if (PEER_SEL(peers[i].status) >= min_peer_sel){
-                        if(verbose) printf("Getting offset, jitter and stratum for peer %.2x\n", ntohs(peers[i].assoc));
+                if (PEER_SEL(peers[i].status) >= min_peer_sel) {
+                        if (verbose)
+                                printf("Getting offset, jitter and stratum for peer %.2x\n", ntohs(peers[i].assoc));
                         xasprintf(&data, "");
-                        do{
+                        do {
                                 setup_control_request(&req, OP_READVAR, 2);
                                 req.assoc = peers[i].assoc;
                                 /* Putting the wanted variable names in the request
@@ -309,7 +329,7 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                  */
                                 /* Older servers doesn't know what jitter is, so if we get an
                                  * error on the first pass we redo it with "dispersion" */
-                                strncpy(req.data, getvar, MAX_CM_SIZE-1);
+                                strncpy(req.data, getvar, MAX_CM_SIZE - 1);
                                 req.count = htons(strlen(getvar));
                                 DBG(printf("sending READVAR request...\n"));
                                 write(conn, &req, SIZEOF_NTPCM(req));
@@ -320,44 +340,53 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                         DBG(printf("receiving READVAR response...\n"));
                                         read(conn, &req, SIZEOF_NTPCM(req));
                                         DBG(print_ntp_control_message(&req));
-                                } while (!(req.op&OP_READVAR && ntohs(req.seq) == 2));
+                                } while (!(req.op & OP_READVAR && ntohs(req.seq) == 2));
 
-                                if(!(req.op&REM_ERROR))
+                                if (!(req.op & REM_ERROR))
                                         xasprintf(&data, "%s%s", data, req.data);
-                        } while(req.op&REM_MORE);
+                        } while (req.op & REM_MORE);
 
-                        if(req.op&REM_ERROR) {
-                                if(strstr(getvar, "jitter")) {
-                                        if(verbose) printf("The command failed. This is usually caused by servers refusing the 'jitter'\nvariable. Restarting with 'dispersion'...\n");
+                        if (req.op & REM_ERROR) {
+                                if (strstr(getvar, "jitter")) {
+                                        if (verbose)
+                                                printf("The command failed. This is usually caused by servers refusing the 'jitter'\nvariable. Restarting with "
+                                                           "'dispersion'...\n");
                                         getvar = "stratum,offset,dispersion";
                                         i--;
                                         continue;
-                                } else if(strlen(getvar)) {
-                                        if(verbose) printf("Server didn't like dispersion either; will retrieve everything\n");
+                                }
+                                if (strlen(getvar)) {
+                                        if (verbose)
+                                                printf("Server didn't like dispersion either; will retrieve everything\n");
                                         getvar = "";
                                         i--;
                                         continue;
                                 }
                         }
 
-                        if(verbose > 1)
+                        if (verbose > 1)
                                 printf("Server responded: >>>%s<<<\n", data);
 
+                        double tmp_offset = 0;
+                        char *value;
+                        char *nptr;
                         /* get the offset */
-                        if(verbose)
+                        if (verbose)
                                 printf("parsing offset from peer %.2x: ", ntohs(peers[i].assoc));
 
                         value = np_extract_ntpvar(data, "offset");
-                        nptr=NULL;
+                        nptr = NULL;
                         /* Convert the value if we have one */
-                        if(value != NULL)
+                        if (value != NULL)
                                 tmp_offset = strtod(value, &nptr) / 1000;
                         /* If value is null or no conversion was performed */
-                        if(value == NULL || value==nptr) {
-                                if(verbose) printf("error: unable to read server offset response.\n");
+                        if (value == NULL || value == nptr) {
+                                if (verbose)
+                                        printf("error: unable to read server offset response.\n");
                         } else {
-                                if(verbose) printf("%.10g\n", tmp_offset);
-                                if(*offset_result == STATE_UNKNOWN || fabs(tmp_offset) < fabs(*offset)) {
+                                if (verbose)
+                                        printf("%.10g\n", tmp_offset);
+                                if (*offset_result == STATE_UNKNOWN || fabs(tmp_offset) < fabs(*offset)) {
                                         *offset = tmp_offset;
                                         *offset_result = STATE_OK;
                                 } else {
@@ -366,85 +395,75 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                 }
                         }
 
-                        if(do_jitter) {
+                        if (do_jitter) {
                                 /* get the jitter */
-                                if(verbose) {
-                                        printf("parsing %s from peer %.2x: ", strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter", ntohs(peers[i].assoc));
+                                if (verbose) {
+                                        printf("parsing %s from peer %.2x: ", strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter",
+                                                   ntohs(peers[i].assoc));
                                 }
                                 value = np_extract_ntpvar(data, strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter");
-                                nptr=NULL;
+                                nptr = NULL;
                                 /* Convert the value if we have one */
-                                if(value != NULL)
+                                if (value != NULL)
                                         *jitter = strtod(value, &nptr);
                                 /* If value is null or no conversion was performed */
-                                if(value == NULL || value==nptr) {
-                                        if(verbose) printf("error: unable to read server jitter/dispersion response.\n");
+                                if (value == NULL || value == nptr) {
+                                        if (verbose)
+                                                printf("error: unable to read server jitter/dispersion response.\n");
                                         *jitter = -1;
-                                } else if(verbose) {
+                                } else if (verbose) {
                                         printf("%.10g\n", *jitter);
                                 }
                         }
 
-                        if(do_stratum) {
+                        if (do_stratum) {
                                 /* get the stratum */
-                                if(verbose) {
+                                if (verbose) {
                                         printf("parsing stratum from peer %.2x: ", ntohs(peers[i].assoc));
                                 }
                                 value = np_extract_ntpvar(data, "stratum");
-                                nptr=NULL;
+                                nptr = NULL;
                                 /* Convert the value if we have one */
-                                if(value != NULL)
+                                if (value != NULL)
                                         *stratum = strtol(value, &nptr, 10);
-                                if(value == NULL || value==nptr) {
-                                        if(verbose) printf("error: unable to read server stratum response.\n");
+                                if (value == NULL || value == nptr) {
+                                        if (verbose)
+                                                printf("error: unable to read server stratum response.\n");
                                         *stratum = -1;
                                 } else {
-                                        if(verbose) printf("%i\n", *stratum);
+                                        if (verbose)
+                                                printf("%i\n", *stratum);
                                 }
                         }
                 } /* if (PEER_SEL(peers[i].status) >= min_peer_sel) */
-        } /* for (i = 0; i < npeers; i++) */
+        }     /* for (i = 0; i < npeers; i++) */
 
         close(conn);
-        if(peers!=NULL) free(peers);
+        if (peers != NULL)
+                free(peers);
 
         return status;
 }
 
-int process_arguments(int argc, char **argv){
-        int c;
-        int option=0;
+int process_arguments(int argc, char **argv) {
         static struct option longopts[] = {
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {"quiet", no_argument, 0, 'q'},
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"swarn", required_argument, 0, 'W'},
-                {"scrit", required_argument, 0, 'C'},
-                {"jwarn", required_argument, 0, 'j'},
-                {"jcrit", required_argument, 0, 'k'},
-                {"twarn", required_argument, 0, 'm'},
-                {"tcrit", required_argument, 0, 'n'},
-                {"timeout", required_argument, 0, 't'},
-                {"hostname", required_argument, 0, 'H'},
-                {"port", required_argument, 0, 'p'},
-                {0, 0, 0, 0}
-        };
-
+                {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},           {"verbose", no_argument, 0, 'v'},
+                {"use-ipv4", no_argument, 0, '4'},       {"use-ipv6", no_argument, 0, '6'},       {"quiet", no_argument, 0, 'q'},
+                {"warning", required_argument, 0, 'w'},  {"critical", required_argument, 0, 'c'}, {"swarn", required_argument, 0, 'W'},
+                {"scrit", required_argument, 0, 'C'},    {"jwarn", required_argument, 0, 'j'},    {"jcrit", required_argument, 0, 'k'},
+                {"twarn", required_argument, 0, 'm'},    {"tcrit", required_argument, 0, 'n'},    {"timeout", required_argument, 0, 't'},
+                {"hostname", required_argument, 0, 'H'}, {"port", required_argument, 0, 'p'},     {0, 0, 0, 0}};
 
         if (argc < 2)
-                usage ("\n");
+                usage("\n");
 
         while (true) {
-                c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option);
-                if (c == -1 || c == EOF || c == 1)
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option);
+                if (option_char == -1 || option_char == EOF || option_char == 1)
                         break;
 
-                switch (c) {
+                switch (option_char) {
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -490,15 +509,15 @@ int process_arguments(int argc, char **argv){
                         tcrit = optarg;
                         break;
                 case 'H':
-                        if(!is_host(optarg))
+                        if (!is_host(optarg))
                                 usage2(_("Invalid hostname/address"), optarg);
                         server_address = strdup(optarg);
                         break;
                 case 'p':
-                        port=atoi(optarg);
+                        port = atoi(optarg);
                         break;
                 case 't':
-                        socket_timeout=atoi(optarg);
+                        socket_timeout = atoi(optarg);
                         break;
                 case '4':
                         address_family = AF_INET;
@@ -507,69 +526,53 @@ int process_arguments(int argc, char **argv){
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
                 case '?':
                         /* print short usage statement if args not parsable */
-                        usage5 ();
+                        usage5();
                         break;
                 }
         }
 
-        if(server_address == NULL){
+        if (server_address == NULL) {
                 usage4(_("Hostname was not supplied"));
         }
 
         return 0;
 }
 
-char *perfd_offset (double offset)
-{
-        return fperfdata ("offset", offset, "s",
-                true, offset_thresholds->warning->end,
-                true, offset_thresholds->critical->end,
-                false, 0, false, 0);
+char *perfd_offset(double offset) {
+        return fperfdata("offset", offset, "s", true, offset_thresholds->warning->end, true, offset_thresholds->critical->end, false, 0, false,
+                                         0);
 }
 
-char *perfd_jitter (double jitter)
-{
-        return fperfdata ("jitter", jitter, "",
-                do_jitter, jitter_thresholds->warning->end,
-                do_jitter, jitter_thresholds->critical->end,
-                true, 0, false, 0);
+char *perfd_jitter(double jitter) {
+        return fperfdata("jitter", jitter, "", do_jitter, jitter_thresholds->warning->end, do_jitter, jitter_thresholds->critical->end, true, 0,
+                                         false, 0);
 }
 
-char *perfd_stratum (int stratum)
-{
-        return perfdata ("stratum", stratum, "",
-                do_stratum, (int)stratum_thresholds->warning->end,
-                do_stratum, (int)stratum_thresholds->critical->end,
-                true, 0, true, 16);
+char *perfd_stratum(int stratum) {
+        return perfdata("stratum", stratum, "", do_stratum, (int)stratum_thresholds->warning->end, do_stratum,
+                                        (int)stratum_thresholds->critical->end, true, 0, true, 16);
 }
 
-char *perfd_truechimers (int num_truechimers)
-{
-        return perfdata ("truechimers", num_truechimers, "",
-                do_truechimers, (int)truechimer_thresholds->warning->end,
-                do_truechimers, (int)truechimer_thresholds->critical->end,
-                true, 0, false, 0);
+char *perfd_truechimers(int num_truechimers) {
+        return perfdata("truechimers", num_truechimers, "", do_truechimers, (int)truechimer_thresholds->warning->end, do_truechimers,
+                                        (int)truechimer_thresholds->critical->end, true, 0, false, 0);
 }
 
-int main(int argc, char *argv[]){
-        int result, offset_result, stratum, num_truechimers;
-        double offset=0, jitter=0;
-        char *result_line, *perfdata_line;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char *argv[]) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         set_thresholds(&offset_thresholds, owarn, ocrit);
         set_thresholds(&jitter_thresholds, jwarn, jcrit);
@@ -577,15 +580,20 @@ int main(int argc, char *argv[]){
         set_thresholds(&truechimer_thresholds, twarn, tcrit);
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
 
+        int offset_result;
+        int stratum;
+        int num_truechimers;
+        double offset = 0;
+        double jitter = 0;
         /* This returns either OK or WARNING (See comment preceding ntp_request) */
-        result = ntp_request(&offset, &offset_result, &jitter, &stratum, &num_truechimers);
+        int result = ntp_request(&offset, &offset_result, &jitter, &stratum, &num_truechimers);
 
-        if(offset_result == STATE_UNKNOWN) {
+        if (offset_result == STATE_UNKNOWN) {
                 /* if there's no sync peer (this overrides ntp_request output): */
                 result = (quiet ? STATE_UNKNOWN : STATE_CRITICAL);
         } else {
@@ -597,50 +605,49 @@ int main(int argc, char *argv[]){
 
         int oresult = result;
 
-
         int tresult = STATE_UNKNOWN;
-        
-        if(do_truechimers) {
+
+        if (do_truechimers) {
                 tresult = get_status(num_truechimers, truechimer_thresholds);
                 result = max_state_alt(result, tresult);
         }
 
-
         int sresult = STATE_UNKNOWN;
 
-        if(do_stratum) {
+        if (do_stratum) {
                 sresult = get_status(stratum, stratum_thresholds);
                 result = max_state_alt(result, sresult);
         }
 
-
         int jresult = STATE_UNKNOWN;
 
-        if(do_jitter) {
+        if (do_jitter) {
                 jresult = get_status(jitter, jitter_thresholds);
                 result = max_state_alt(result, jresult);
         }
 
+        char *result_line;
         switch (result) {
-                case STATE_CRITICAL :
-                        xasprintf(&result_line, _("NTP CRITICAL:"));
-                        break;
-                case STATE_WARNING :
-                        xasprintf(&result_line, _("NTP WARNING:"));
-                        break;
-                case STATE_OK :
-                        xasprintf(&result_line, _("NTP OK:"));
-                        break;
-                default :
-                        xasprintf(&result_line, _("NTP UNKNOWN:"));
-                        break;
+        case STATE_CRITICAL:
+                xasprintf(&result_line, _("NTP CRITICAL:"));
+                break;
+        case STATE_WARNING:
+                xasprintf(&result_line, _("NTP WARNING:"));
+                break;
+        case STATE_OK:
+                xasprintf(&result_line, _("NTP OK:"));
+                break;
+        default:
+                xasprintf(&result_line, _("NTP UNKNOWN:"));
+                break;
         }
-        if(!syncsource_found)
+        if (!syncsource_found)
                 xasprintf(&result_line, "%s %s,", result_line, _("Server not synchronized"));
-        else if(li_alarm)
+        else if (li_alarm)
                 xasprintf(&result_line, "%s %s,", result_line, _("Server has the LI_ALARM bit set"));
 
-        if(offset_result == STATE_UNKNOWN){
+        char *perfdata_line;
+        if (offset_result == STATE_UNKNOWN) {
                 xasprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
                 xasprintf(&perfdata_line, "");
         } else if (oresult == STATE_WARNING) {
@@ -649,9 +656,9 @@ int main(int argc, char *argv[]){
                 xasprintf(&result_line, "%s %s %.10g secs (CRITICAL)", result_line, _("Offset"), offset);
         } else {
                 xasprintf(&result_line, "%s %s %.10g secs", result_line, _("Offset"), offset);
-        }       
+        }
         xasprintf(&perfdata_line, "%s", perfd_offset(offset));
-        
+
         if (do_jitter) {
                 if (jresult == STATE_WARNING) {
                         xasprintf(&result_line, "%s, jitter=%f (WARNING)", result_line, jitter);
@@ -684,45 +691,46 @@ int main(int argc, char *argv[]){
         }
         printf("%s|%s\n", result_line, perfdata_line);
 
-        if(server_address!=NULL) free(server_address);
+        if (server_address != NULL)
+                free(server_address);
         return result;
 }
 
-void print_help(void){
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 2006 Sean Finney\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 2006 Sean Finney\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin checks the selected ntp server"));
+        printf("%s\n", _("This plugin checks the selected ntp server"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (UT_IPv46);
-        printf (UT_HOST_PORT, 'p', "123");
-        printf (" %s\n", "-q, --quiet");
-        printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("Offset to result in warning status (seconds)"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("Offset to result in critical status (seconds)"));
-        printf (" %s\n", "-W, --swarn=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for stratum of server's synchronization peer"));
-        printf (" %s\n", "-C, --scrit=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for stratum of server's synchronization peer"));
-        printf (" %s\n", "-j, --jwarn=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for jitter"));
-        printf (" %s\n", "-k, --jcrit=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for jitter"));
-        printf (" %s\n", "-m, --twarn=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
-        printf (" %s\n", "-n, --tcrit=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf (UT_VERBOSE);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(UT_IPv46);
+        printf(UT_HOST_PORT, 'p', "123");
+        printf(" %s\n", "-q, --quiet");
+        printf("    %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("Offset to result in warning status (seconds)"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("Offset to result in critical status (seconds)"));
+        printf(" %s\n", "-W, --swarn=THRESHOLD");
+        printf("    %s\n", _("Warning threshold for stratum of server's synchronization peer"));
+        printf(" %s\n", "-C, --scrit=THRESHOLD");
+        printf("    %s\n", _("Critical threshold for stratum of server's synchronization peer"));
+        printf(" %s\n", "-j, --jwarn=THRESHOLD");
+        printf("    %s\n", _("Warning threshold for jitter"));
+        printf(" %s\n", "-k, --jcrit=THRESHOLD");
+        printf("    %s\n", _("Critical threshold for jitter"));
+        printf(" %s\n", "-m, --twarn=THRESHOLD");
+        printf("    %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
+        printf(" %s\n", "-n, --tcrit=THRESHOLD");
+        printf("    %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("This plugin checks an NTP server independent of any commandline"));
@@ -751,13 +759,11 @@ void print_help(void){
         printf(" %s\n", _("Check only stratum:"));
         printf("  %s\n", ("./check_ntp_peer -H ntpserv -W 4 -C 6"));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage(void)
-{
-        printf ("%s\n", _("Usage:"));
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
         printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
         printf("       [-j <warn>] [-k <crit>] [-v verbose]\n");
 }
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index b2e1655..703b69d 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -1,63 +1,63 @@
 /*****************************************************************************
-* 
-* Monitoring check_ntp_time plugin
-* 
-* License: GPL
-* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ntp_time plugin
-* 
-* This plugin checks the clock offset between the local host and a
-* remote NTP server. It is independent of any commandline programs or
-* external libraries.
-* 
-* If you'd rather want to monitor an NTP server, please use
-* check_ntp_peer.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_ntp_time plugin
+ *
+ * License: GPL
+ * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
+ * Copyright (c) 2006-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ntp_time plugin
+ *
+ * This plugin checks the clock offset between the local host and a
+ * remote NTP server. It is independent of any commandline programs or
+ * external libraries.
+ *
+ * If you'd rather want to monitor an NTP server, please use
+ * check_ntp_peer.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_ntp_time";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 
-static char *server_address=NULL;
-static char *port="123";
-static int verbose=0;
+static char *server_address = NULL;
+static char *port = "123";
+static int verbose = 0;
 static bool quiet = false;
-static char *owarn="60";
-static char *ocrit="120";
-static int time_offset=0;
+static char *owarn = "60";
+static char *ocrit = "120";
+static int time_offset = 0;
 
-int process_arguments (int, char **);
-thresholds *offset_thresholds = NULL;
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int, char **);
+static thresholds *offset_thresholds = NULL;
+static void print_help(void);
+void print_usage(void);
 
 /* number of times to perform each request to get a good average. */
 #ifndef AVG_NUM
-#define AVG_NUM 4
+#       define AVG_NUM 4
 #endif
 
 /* max size of control message data */
@@ -65,17 +65,17 @@ void print_usage (void);
 
 /* this structure holds everything in an ntp request/response as per rfc1305 */
 typedef struct {
-        uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
-        uint8_t stratum;     /* clock stratum */
-        int8_t poll;         /* polling interval */
-        int8_t precision;    /* precision of the local clock */
-        int32_t rtdelay;     /* total rt delay, as a fixed point num. see macros */
-        uint32_t rtdisp;     /* like above, but for max err to primary src */
-        uint32_t refid;      /* ref clock identifier */
-        uint64_t refts;      /* reference timestamp.  local time local clock */
-        uint64_t origts;     /* time at which request departed client */
-        uint64_t rxts;       /* time at which request arrived at server */
-        uint64_t txts;       /* time at which request departed server */
+        uint8_t flags;    /* byte with leapindicator,vers,mode. see macros */
+        uint8_t stratum;  /* clock stratum */
+        int8_t poll;      /* polling interval */
+        int8_t precision; /* precision of the local clock */
+        int32_t rtdelay;  /* total rt delay, as a fixed point num. see macros */
+        uint32_t rtdisp;  /* like above, but for max err to primary src */
+        uint32_t refid;   /* ref clock identifier */
+        uint64_t refts;   /* reference timestamp.  local time local clock */
+        uint64_t origts;  /* time at which request departed client */
+        uint64_t rxts;    /* time at which request arrived at server */
+        uint64_t txts;    /* time at which request departed server */
 } ntp_message;
 
 /* this structure holds data about results from querying offset from a peer */
@@ -86,43 +86,55 @@ typedef struct {
         double rtdelay;         /* converted from the ntp_message */
         double rtdisp;          /* converted from the ntp_message */
         double offset[AVG_NUM]; /* offsets from each response */
-        uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
+        uint8_t flags;          /* byte with leapindicator,vers,mode. see macros */
 } ntp_server_results;
 
 /* bits 1,2 are the leap indicator */
 #define LI_MASK 0xc0
-#define LI(x) ((x&LI_MASK)>>6)
-#define LI_SET(x,y) do{ x |= ((y<<6)&LI_MASK); }while(0)
+#define LI(x)   ((x & LI_MASK) >> 6)
+#define LI_SET(x, y)                                                                                                                       \
+        do {                                                                                                                                   \
+                x |= ((y << 6) & LI_MASK);                                                                                                         \
+        } while (0)
 /* and these are the values of the leap indicator */
-#define LI_NOWARNING 0x00
-#define LI_EXTRASEC 0x01
+#define LI_NOWARNING  0x00
+#define LI_EXTRASEC   0x01
 #define LI_MISSINGSEC 0x02
-#define LI_ALARM 0x03
+#define LI_ALARM      0x03
 /* bits 3,4,5 are the ntp version */
 #define VN_MASK 0x38
-#define VN(x)   ((x&VN_MASK)>>3)
-#define VN_SET(x,y)     do{ x |= ((y<<3)&VN_MASK); }while(0)
+#define VN(x)   ((x & VN_MASK) >> 3)
+#define VN_SET(x, y)                                                                                                                       \
+        do {                                                                                                                                   \
+                x |= ((y << 3) & VN_MASK);                                                                                                         \
+        } while (0)
 #define VN_RESERVED 0x02
 /* bits 6,7,8 are the ntp mode */
 #define MODE_MASK 0x07
-#define MODE(x) (x&MODE_MASK)
-#define MODE_SET(x,y)   do{ x |= (y&MODE_MASK); }while(0)
+#define MODE(x)   (x & MODE_MASK)
+#define MODE_SET(x, y)                                                                                                                     \
+        do {                                                                                                                                   \
+                x |= (y & MODE_MASK);                                                                                                              \
+        } while (0)
 /* here are some values */
-#define MODE_CLIENT 0x03
+#define MODE_CLIENT     0x03
 #define MODE_CONTROLMSG 0x06
 /* In control message, bits 8-10 are R,E,M bits */
-#define REM_MASK 0xe0
-#define REM_RESP 0x80
+#define REM_MASK  0xe0
+#define REM_RESP  0x80
 #define REM_ERROR 0x40
-#define REM_MORE 0x20
+#define REM_MORE  0x20
 /* In control message, bits 11 - 15 are opcode */
 #define OP_MASK 0x1f
-#define OP_SET(x,y)   do{ x |= (y&OP_MASK); }while(0)
+#define OP_SET(x, y)                                                                                                                       \
+        do {                                                                                                                                   \
+                x |= (y & OP_MASK);                                                                                                                \
+        } while (0)
 #define OP_READSTAT 0x01
 #define OP_READVAR  0x02
 /* In peer status bytes, bits 6,7,8 determine clock selection status */
-#define PEER_SEL(x) ((ntohs(x)>>8)&0x07)
-#define PEER_INCLUDED 0x04
+#define PEER_SEL(x)     ((ntohs(x) >> 8) & 0x07)
+#define PEER_INCLUDED   0x04
 #define PEER_SYNCSOURCE 0x06
 
 /**
@@ -136,82 +148,91 @@ typedef struct {
 
 /* macros to access the left/right 16 bits of a 32-bit ntp "fixed point"
    number.  note that these can be used as lvalues too */
-#define L16(x) (((uint16_t*)&x)[0])
-#define R16(x) (((uint16_t*)&x)[1])
+#define L16(x) (((uint16_t *)&x)[0])
+#define R16(x) (((uint16_t *)&x)[1])
 /* macros to access the left/right 32 bits of a 64-bit ntp "fixed point"
    number.  these too can be used as lvalues */
-#define L32(x) (((uint32_t*)&x)[0])
-#define R32(x) (((uint32_t*)&x)[1])
+#define L32(x) (((uint32_t *)&x)[0])
+#define R32(x) (((uint32_t *)&x)[1])
 
 /* ntp wants seconds since 1/1/00, epoch is 1/1/70.  this is the difference */
 #define EPOCHDIFF 0x83aa7e80UL
 
 /* extract a 32-bit ntp fixed point number into a double */
-#define NTP32asDOUBLE(x) (ntohs(L16(x)) + (double)ntohs(R16(x))/65536.0)
+#define NTP32asDOUBLE(x) (ntohs(L16(x)) + (double)ntohs(R16(x)) / 65536.0)
 
 /* likewise for a 64-bit ntp fp number */
-#define NTP64asDOUBLE(n) (double)(((uint64_t)n)?\
-                         (ntohl(L32(n))-EPOCHDIFF) + \
-                         (.00000001*(0.5+(double)(ntohl(R32(n))/42.94967296))):\
-                         0)
+#define NTP64asDOUBLE(n)                                                                                                                   \
+        (double)(((uint64_t)n) ? (ntohl(L32(n)) - EPOCHDIFF) + (.00000001 * (0.5 + (double)(ntohl(R32(n)) / 42.94967296))) : 0)
 
 /* convert a struct timeval to a double */
-#define TVasDOUBLE(x) (double)(x.tv_sec+(0.000001*x.tv_usec))
+#define TVasDOUBLE(x) (double)(x.tv_sec + (0.000001 * x.tv_usec))
 
 /* convert an ntp 64-bit fp number to a struct timeval */
-#define NTP64toTV(n,t) \
-        do{ if(!n) t.tv_sec = t.tv_usec = 0; \
-            else { \
-                        t.tv_sec=ntohl(L32(n))-EPOCHDIFF; \
-                        t.tv_usec=(int)(0.5+(double)(ntohl(R32(n))/4294.967296)); \
-                } \
-        }while(0)
+#define NTP64toTV(n, t)                                                                                                                    \
+        do {                                                                                                                                   \
+                if (!n)                                                                                                                            \
+                        t.tv_sec = t.tv_usec = 0;                                                                                                      \
+                else {                                                                                                                             \
+                        t.tv_sec = ntohl(L32(n)) - EPOCHDIFF;                                                                                          \
+                        t.tv_usec = (int)(0.5 + (double)(ntohl(R32(n)) / 4294.967296));                                                                \
+                }                                                                                                                                  \
+        } while (0)
 
 /* convert a struct timeval to an ntp 64-bit fp number */
-#define TVtoNTP64(t,n) \
-        do{ if(!t.tv_usec && !t.tv_sec) n=0x0UL; \
-                else { \
-                        L32(n)=htonl(t.tv_sec + EPOCHDIFF); \
-                        R32(n)=htonl((uint64_t)((4294.967296*t.tv_usec)+.5)); \
-                } \
-        } while(0)
+#define TVtoNTP64(t, n)                                                                                                                    \
+        do {                                                                                                                                   \
+                if (!t.tv_usec && !t.tv_sec)                                                                                                       \
+                        n = 0x0UL;                                                                                                                     \
+                else {                                                                                                                             \
+                        L32(n) = htonl(t.tv_sec + EPOCHDIFF);                                                                                          \
+                        R32(n) = htonl((uint64_t)((4294.967296 * t.tv_usec) + .5));                                                                    \
+                }                                                                                                                                  \
+        } while (0)
 
 /* NTP control message header is 12 bytes, plus any data in the data
  * field, plus null padding to the nearest 32-bit boundary per rfc.
  */
-#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0))
+#define SIZEOF_NTPCM(m) (12 + ntohs(m.count) + ((m.count) ? 4 - (ntohs(m.count) % 4) : 0))
 
 /* finally, a little helper or two for debugging: */
-#define DBG(x) do{if(verbose>1){ x; }}while(0);
-#define PRINTSOCKADDR(x) \
-        do{ \
-                printf("%u.%u.%u.%u", (x>>24)&0xff, (x>>16)&0xff, (x>>8)&0xff, x&0xff);\
-        }while(0);
+#define DBG(x)                                                                                                                             \
+        do {                                                                                                                                   \
+                if (verbose > 1) {                                                                                                                 \
+                        x;                                                                                                                             \
+                }                                                                                                                                  \
+        } while (0);
+#define PRINTSOCKADDR(x)                                                                                                                   \
+        do {                                                                                                                                   \
+                printf("%u.%u.%u.%u", (x >> 24) & 0xff, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);                                              \
+        } while (0);
 
 /* calculate the offset of the local clock */
-static inline double calc_offset(const ntp_message *m, const struct timeval *t){
-        double client_tx, peer_rx, peer_tx, client_rx;
-        client_tx = NTP64asDOUBLE(m->origts);
-        peer_rx = NTP64asDOUBLE(m->rxts);
-        peer_tx = NTP64asDOUBLE(m->txts);
-        client_rx=TVasDOUBLE((*t));
-        return (.5*((peer_tx-client_rx)+(peer_rx-client_tx)));
+static inline double calc_offset(const ntp_message *m, const struct timeval *t) {
+        double client_tx = NTP64asDOUBLE(m->origts);
+        double peer_rx = NTP64asDOUBLE(m->rxts);
+        double peer_tx = NTP64asDOUBLE(m->txts);
+        double client_rx = TVasDOUBLE((*t));
+        return (.5 * ((peer_tx - client_rx) + (peer_rx - client_tx)));
 }
 
 /* print out a ntp packet in human readable/debuggable format */
-void print_ntp_message(const ntp_message *p){
-        struct timeval ref, orig, rx, tx;
+void print_ntp_message(const ntp_message *p) {
+        struct timeval ref;
+        struct timeval orig;
+        struct timeval rx;
+        struct timeval tx;
 
-        NTP64toTV(p->refts,ref);
-        NTP64toTV(p->origts,orig);
-        NTP64toTV(p->rxts,rx);
-        NTP64toTV(p->txts,tx);
+        NTP64toTV(p->refts, ref);
+        NTP64toTV(p->origts, orig);
+        NTP64toTV(p->rxts, rx);
+        NTP64toTV(p->txts, tx);
 
         printf("packet contents:\n");
         printf("\tflags: 0x%.2x\n", p->flags);
-        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags&LI_MASK);
-        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags&VN_MASK);
-        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags&MODE_MASK);
+        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags & LI_MASK);
+        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags & VN_MASK);
+        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags & MODE_MASK);
         printf("\tstratum = %d\n", p->stratum);
         printf("\tpoll = %g\n", pow(2, p->poll));
         printf("\tprecision = %g\n", pow(2, p->precision));
@@ -224,41 +245,42 @@ void print_ntp_message(const ntp_message *p){
         printf("\ttxts = %-.16g\n", NTP64asDOUBLE(p->txts));
 }
 
-void setup_request(ntp_message *p){
-        struct timeval t;
-
+void setup_request(ntp_message *p) {
         memset(p, 0, sizeof(ntp_message));
         LI_SET(p->flags, LI_ALARM);
         VN_SET(p->flags, 4);
         MODE_SET(p->flags, MODE_CLIENT);
-        p->poll=4;
-        p->precision=(int8_t)0xfa;
-        L16(p->rtdelay)=htons(1);
-        L16(p->rtdisp)=htons(1);
+        p->poll = 4;
+        p->precision = (int8_t)0xfa;
+        L16(p->rtdelay) = htons(1);
+        L16(p->rtdisp) = htons(1);
 
+        struct timeval t;
         gettimeofday(&t, NULL);
-        TVtoNTP64(t,p->txts);
+        TVtoNTP64(t, p->txts);
 }
 
 /* select the "best" server from a list of servers, and return its index.
  * this is done by filtering servers based on stratum, dispersion, and
  * finally round-trip delay. */
-int best_offset_server(const ntp_server_results *slist, int nservers){
-        int cserver=0, best_server=-1;
+int best_offset_server(const ntp_server_results *slist, int nservers) {
+        int best_server = -1;
 
         /* for each server */
-        for(cserver=0; cserver<nservers; cserver++){
+        for (int cserver = 0; cserver < nservers; cserver++) {
                 /* We don't want any servers that fails these tests */
                 /* Sort out servers that didn't respond or responede with a 0 stratum;
                  * stratum 0 is for reference clocks so no NTP server should ever report
                  * a stratum 0 */
-                if ( slist[cserver].stratum == 0){
-                        if (verbose) printf("discarding peer %d: stratum=%d\n", cserver, slist[cserver].stratum);
+                if (slist[cserver].stratum == 0) {
+                        if (verbose)
+                                printf("discarding peer %d: stratum=%d\n", cserver, slist[cserver].stratum);
                         continue;
                 }
                 /* Sort out servers with error flags */
-                if ( LI(slist[cserver].flags) == LI_ALARM ){
-                        if (verbose) printf("discarding peer %d: flags=%d\n", cserver, LI(slist[cserver].flags));
+                if (LI(slist[cserver].flags) == LI_ALARM) {
+                        if (verbose)
+                                printf("discarding peer %d: flags=%d\n", cserver, LI(slist[cserver].flags));
                         continue;
                 }
 
@@ -272,13 +294,13 @@ int best_offset_server(const ntp_server_results *slist, int nservers){
                 /* compare the server to the best one we've seen so far */
                 /* does it have an equal or better stratum? */
                 DBG(printf("comparing peer %d with peer %d\n", cserver, best_server));
-                if(slist[cserver].stratum <= slist[best_server].stratum){
+                if (slist[cserver].stratum <= slist[best_server].stratum) {
                         DBG(printf("stratum for peer %d <= peer %d\n", cserver, best_server));
                         /* does it have an equal or better dispersion? */
-                        if(slist[cserver].rtdisp <= slist[best_server].rtdisp){
+                        if (slist[cserver].rtdisp <= slist[best_server].rtdisp) {
                                 DBG(printf("dispersion for peer %d <= peer %d\n", cserver, best_server));
                                 /* does it have a better rtdelay? */
-                                if(slist[cserver].rtdelay < slist[best_server].rtdelay){
+                                if (slist[cserver].rtdelay < slist[best_server].rtdelay) {
                                         DBG(printf("rtdelay for peer %d < peer %d\n", cserver, best_server));
                                         best_server = cserver;
                                         DBG(printf("peer %d is now our best candidate\n", best_server));
@@ -287,13 +309,12 @@ int best_offset_server(const ntp_server_results *slist, int nservers){
                 }
         }
 
-        if(best_server >= 0) {
+        if (best_server >= 0) {
                 DBG(printf("best server selected: peer %d\n", best_server));
                 return best_server;
-        } else {
-                DBG(printf("no peers meeting synchronization criteria :(\n"));
-                return -1;
         }
+        DBG(printf("no peers meeting synchronization criteria :(\n"));
+        return -1;
 }
 
 /* do everything we need to get the total average offset
@@ -301,178 +322,190 @@ int best_offset_server(const ntp_server_results *slist, int nservers){
  *   we don't waste time sitting around waiting for single packets.
  * - we also "manually" handle resolving host names and connecting, because
  *   we have to do it in a way that our lazy macros don't handle currently :( */
-double offset_request(const char *host, int *status){
-        int i=0, j=0, ga_result=0, num_hosts=0, *socklist=NULL, respnum=0;
-        int servers_completed=0, one_read=0, servers_readable=0, best_index=-1;
-        time_t now_time=0, start_ts=0;
-        ntp_message *req=NULL;
-        double avg_offset=0.;
-        struct timeval recv_time;
-        struct addrinfo *ai=NULL, *ai_tmp=NULL, hints;
-        struct pollfd *ufds=NULL;
-        ntp_server_results *servers=NULL;
-
+double offset_request(const char *host, int *status) {
         /* setup hints to only return results from getaddrinfo that we'd like */
+        struct addrinfo hints;
         memset(&hints, 0, sizeof(struct addrinfo));
         hints.ai_family = address_family;
         hints.ai_protocol = IPPROTO_UDP;
         hints.ai_socktype = SOCK_DGRAM;
 
         /* fill in ai with the list of hosts resolved by the host name */
-        ga_result = getaddrinfo(host, port, &hints, &ai);
-        if(ga_result!=0){
-                die(STATE_UNKNOWN, "error getting address for %s: %s\n",
-                    host, gai_strerror(ga_result));
+        struct addrinfo *ai = NULL;
+        int ga_result = getaddrinfo(host, port, &hints, &ai);
+        if (ga_result != 0) {
+                die(STATE_UNKNOWN, "error getting address for %s: %s\n", host, gai_strerror(ga_result));
         }
 
         /* count the number of returned hosts, and allocate stuff accordingly */
-        for(ai_tmp=ai; ai_tmp!=NULL; ai_tmp=ai_tmp->ai_next){ num_hosts++; }
-        req=(ntp_message*)malloc(sizeof(ntp_message)*num_hosts);
-        if(req==NULL) die(STATE_UNKNOWN, "can not allocate ntp message array");
-        socklist=(int*)malloc(sizeof(int)*num_hosts);
-        if(socklist==NULL) die(STATE_UNKNOWN, "can not allocate socket array");
-        ufds=(struct pollfd*)malloc(sizeof(struct pollfd)*num_hosts);
-        if(ufds==NULL) die(STATE_UNKNOWN, "can not allocate socket array");
-        servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts);
-        if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array");
-        memset(servers, 0, sizeof(ntp_server_results)*num_hosts);
+        int num_hosts = 0;
+        for (struct addrinfo *ai_tmp = ai; ai_tmp != NULL; ai_tmp = ai_tmp->ai_next) {
+                num_hosts++;
+        }
+
+        ntp_message *req = (ntp_message *)malloc(sizeof(ntp_message) * num_hosts);
+
+        if (req == NULL)
+                die(STATE_UNKNOWN, "can not allocate ntp message array");
+        int *socklist = (int *)malloc(sizeof(int) * num_hosts);
+
+        if (socklist == NULL)
+                die(STATE_UNKNOWN, "can not allocate socket array");
+
+        struct pollfd *ufds = (struct pollfd *)malloc(sizeof(struct pollfd) * num_hosts);
+        if (ufds == NULL)
+                die(STATE_UNKNOWN, "can not allocate socket array");
+
+        ntp_server_results *servers = (ntp_server_results *)malloc(sizeof(ntp_server_results) * num_hosts);
+        if (servers == NULL)
+                die(STATE_UNKNOWN, "can not allocate server array");
+        memset(servers, 0, sizeof(ntp_server_results) * num_hosts);
         DBG(printf("Found %d peers to check\n", num_hosts));
 
         /* setup each socket for writing, and the corresponding struct pollfd */
-        ai_tmp=ai;
-        for(i=0;ai_tmp;i++){
-                socklist[i]=socket(ai_tmp->ai_family, SOCK_DGRAM, IPPROTO_UDP);
-                if(socklist[i] == -1) {
+        struct addrinfo *ai_tmp = ai;
+        for (int i = 0; ai_tmp; i++) {
+                socklist[i] = socket(ai_tmp->ai_family, SOCK_DGRAM, IPPROTO_UDP);
+                if (socklist[i] == -1) {
                         perror(NULL);
                         die(STATE_UNKNOWN, "can not create new socket");
                 }
-                if(connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)){
+                if (connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)) {
                         /* don't die here, because it is enough if there is one server
                            answering in time. This also would break for dual ipv4/6 stacked
                            ntp servers when the client only supports on of them.
                          */
                         DBG(printf("can't create socket connection on peer %i: %s\n", i, strerror(errno)));
                 } else {
-                        ufds[i].fd=socklist[i];
-                        ufds[i].events=POLLIN;
-                        ufds[i].revents=0;
+                        ufds[i].fd = socklist[i];
+                        ufds[i].events = POLLIN;
+                        ufds[i].revents = 0;
                 }
                 ai_tmp = ai_tmp->ai_next;
         }
 
         /* now do AVG_NUM checks to each host. We stop before timeout/2 seconds
          * have passed in order to ensure post-processing and jitter time. */
-        now_time=start_ts=time(NULL);
-        while(servers_completed<num_hosts && now_time-start_ts <= socket_timeout/2){
+        time_t start_ts = 0;
+        time_t now_time = 0;
+        now_time = start_ts = time(NULL);
+        int servers_completed = 0;
+        bool one_read = false;
+        while (servers_completed < num_hosts && now_time - start_ts <= socket_timeout / 2) {
                 /* loop through each server and find each one which hasn't
                  * been touched in the past second or so and is still lacking
                  * some responses. For each of these servers, send a new request,
                  * and update the "waiting" timestamp with the current time. */
-                now_time=time(NULL);
-
-                for(i=0; i<num_hosts; i++){
-                        if(servers[i].waiting<now_time && servers[i].num_responses<AVG_NUM){
-                                if(verbose && servers[i].waiting != 0) printf("re-");
-                                if(verbose) printf("sending request to peer %d\n", i);
+                now_time = time(NULL);
+
+                for (int i = 0; i < num_hosts; i++) {
+                        if (servers[i].waiting < now_time && servers[i].num_responses < AVG_NUM) {
+                                if (verbose && servers[i].waiting != 0)
+                                        printf("re-");
+                                if (verbose)
+                                        printf("sending request to peer %d\n", i);
                                 setup_request(&req[i]);
                                 write(socklist[i], &req[i], sizeof(ntp_message));
-                                servers[i].waiting=now_time;
+                                servers[i].waiting = now_time;
                                 break;
                         }
                 }
 
                 /* quickly poll for any sockets with pending data */
-                servers_readable=poll(ufds, num_hosts, 100);
-                if(servers_readable==-1){
+                int servers_readable = poll(ufds, num_hosts, 100);
+                if (servers_readable == -1) {
                         perror("polling ntp sockets");
                         die(STATE_UNKNOWN, "communication errors");
                 }
 
                 /* read from any sockets with pending data */
-                for(i=0; servers_readable && i<num_hosts; i++){
-                        if(ufds[i].revents&POLLIN && servers[i].num_responses < AVG_NUM){
-                                if(verbose) {
+                for (int i = 0; servers_readable && i < num_hosts; i++) {
+                        if (ufds[i].revents & POLLIN && servers[i].num_responses < AVG_NUM) {
+                                if (verbose) {
                                         printf("response from peer %d: ", i);
                                 }
 
                                 read(ufds[i].fd, &req[i], sizeof(ntp_message));
+
+                                struct timeval recv_time;
                                 gettimeofday(&recv_time, NULL);
                                 DBG(print_ntp_message(&req[i]));
-                                respnum=servers[i].num_responses++;
-                                servers[i].offset[respnum]=calc_offset(&req[i], &recv_time)+time_offset;
-                                if(verbose) {
+                                int respnum = servers[i].num_responses++;
+                                servers[i].offset[respnum] = calc_offset(&req[i], &recv_time) + time_offset;
+                                if (verbose) {
                                         printf("offset %.10g\n", servers[i].offset[respnum]);
                                 }
-                                servers[i].stratum=req[i].stratum;
-                                servers[i].rtdisp=NTP32asDOUBLE(req[i].rtdisp);
-                                servers[i].rtdelay=NTP32asDOUBLE(req[i].rtdelay);
-                                servers[i].waiting=0;
-                                servers[i].flags=req[i].flags;
+                                servers[i].stratum = req[i].stratum;
+                                servers[i].rtdisp = NTP32asDOUBLE(req[i].rtdisp);
+                                servers[i].rtdelay = NTP32asDOUBLE(req[i].rtdelay);
+                                servers[i].waiting = 0;
+                                servers[i].flags = req[i].flags;
                                 servers_readable--;
-                                one_read = 1;
-                                if(servers[i].num_responses==AVG_NUM) servers_completed++;
+                                one_read = true;
+                                if (servers[i].num_responses == AVG_NUM)
+                                        servers_completed++;
                         }
                 }
                 /* lather, rinse, repeat. */
         }
 
-        if (one_read == 0) {
+        if (one_read == false) {
                 die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
         }
 
         /* now, pick the best server from the list */
-        best_index=best_offset_server(servers, num_hosts);
-        if(best_index < 0){
-                *status=STATE_UNKNOWN;
+        double avg_offset = 0.;
+        int best_index = best_offset_server(servers, num_hosts);
+        if (best_index < 0) {
+                *status = STATE_UNKNOWN;
         } else {
                 /* finally, calculate the average offset */
-                for(i=0; i<servers[best_index].num_responses;i++){
-                        avg_offset+=servers[best_index].offset[i];
+                for (int i = 0; i < servers[best_index].num_responses; i++) {
+                        avg_offset += servers[best_index].offset[i];
                 }
-                avg_offset/=servers[best_index].num_responses;
+                avg_offset /= servers[best_index].num_responses;
         }
 
         /* cleanup */
-        for(j=0; j<num_hosts; j++){ close(socklist[j]); }
+        for (int j = 0; j < num_hosts; j++) {
+                close(socklist[j]);
+        }
         free(socklist);
         free(ufds);
         free(servers);
         free(req);
         freeaddrinfo(ai);
 
-        if(verbose) printf("overall average offset: %.10g\n", avg_offset);
+        if (verbose)
+                printf("overall average offset: %.10g\n", avg_offset);
         return avg_offset;
 }
 
-int process_arguments(int argc, char **argv){
-        int c;
-        int option=0;
-        static struct option longopts[] = {
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {"quiet", no_argument, 0, 'q'},
-                {"time-offset", optional_argument, 0, 'o'},
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"timeout", required_argument, 0, 't'},
-                {"hostname", required_argument, 0, 'H'},
-                {"port", required_argument, 0, 'p'},
-                {0, 0, 0, 0}
-        };
-
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"quiet", no_argument, 0, 'q'},
+                                                                           {"time-offset", optional_argument, 0, 'o'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
-                usage ("\n");
+                usage("\n");
 
-        while (1) {
-                c = getopt_long (argc, argv, "Vhv46qw:c:t:H:p:o:", longopts, &option);
-                if (c == -1 || c == EOF || c == 1)
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "Vhv46qw:c:t:H:p:o:", longopts, &option);
+                if (option_char == -1 || option_char == EOF || option_char == 1)
                         break;
 
-                switch (c) {
+                switch (option_char) {
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -494,7 +527,7 @@ int process_arguments(int argc, char **argv){
                         ocrit = optarg;
                         break;
                 case 'H':
-                        if(!is_host(optarg))
+                        if (!is_host(optarg))
                                 usage2(_("Invalid hostname/address"), optarg);
                         server_address = strdup(optarg);
                         break;
@@ -502,11 +535,11 @@ int process_arguments(int argc, char **argv){
                         port = strdup(optarg);
                         break;
                 case 't':
-                        socket_timeout=atoi(optarg);
+                        socket_timeout = atoi(optarg);
                         break;
                 case 'o':
-                        time_offset=atoi(optarg);
-                        break;
+                        time_offset = atoi(optarg);
+                        break;
                 case '4':
                         address_family = AF_INET;
                         break;
@@ -514,77 +547,74 @@ int process_arguments(int argc, char **argv){
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
                 case '?':
                         /* print short usage statement if args not parsable */
-                        usage5 ();
+                        usage5();
                         break;
                 }
         }
 
-        if(server_address == NULL){
+        if (server_address == NULL) {
                 usage4(_("Hostname was not supplied"));
         }
 
         return 0;
 }
 
-char *perfd_offset (double offset) {
-        return fperfdata ("offset", offset, "s",
-                true, offset_thresholds->warning->end,
-                true, offset_thresholds->critical->end,
-                false, 0, false, 0);
+char *perfd_offset(double offset) {
+        return fperfdata("offset", offset, "s", true, offset_thresholds->warning->end, true, offset_thresholds->critical->end, false, 0, false,
+                                         0);
 }
 
-int main(int argc, char *argv[]){
-        int result, offset_result;
-        double offset=0;
-        char *result_line, *perfdata_line;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
-
-        result = offset_result = STATE_OK;
+int main(int argc, char *argv[]) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         set_thresholds(&offset_thresholds, owarn, ocrit);
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
 
-        offset = offset_request(server_address, &offset_result);
+        int offset_result = STATE_OK;
+        int result = STATE_OK;
+        double offset = offset_request(server_address, &offset_result);
         if (offset_result == STATE_UNKNOWN) {
-                result = ( (!quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
+                result = ((!quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
         } else {
                 result = get_status(fabs(offset), offset_thresholds);
         }
 
+        char *result_line;
         switch (result) {
-                case STATE_CRITICAL :
-                        xasprintf(&result_line, _("NTP CRITICAL:"));
-                        break;
-                case STATE_WARNING :
-                        xasprintf(&result_line, _("NTP WARNING:"));
-                        break;
-                case STATE_OK :
-                        xasprintf(&result_line, _("NTP OK:"));
-                        break;
-                default :
-                        xasprintf(&result_line, _("NTP UNKNOWN:"));
-                        break;
+        case STATE_CRITICAL:
+                xasprintf(&result_line, _("NTP CRITICAL:"));
+                break;
+        case STATE_WARNING:
+                xasprintf(&result_line, _("NTP WARNING:"));
+                break;
+        case STATE_OK:
+                xasprintf(&result_line, _("NTP OK:"));
+                break;
+        default:
+                xasprintf(&result_line, _("NTP UNKNOWN:"));
+                break;
         }
-        if(offset_result == STATE_UNKNOWN){
+
+        char *perfdata_line;
+        if (offset_result == STATE_UNKNOWN) {
                 xasprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
                 xasprintf(&perfdata_line, "");
         } else {
@@ -593,35 +623,36 @@ int main(int argc, char *argv[]){
         }
         printf("%s|%s\n", result_line, perfdata_line);
 
-        if(server_address!=NULL) free(server_address);
+        if (server_address != NULL)
+                free(server_address);
         return result;
 }
 
-void print_help(void){
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 2006 Sean Finney\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 2006 Sean Finney\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin checks the clock offset with the ntp server"));
+        printf("%s\n", _("This plugin checks the clock offset with the ntp server"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (UT_IPv46);
-        printf (UT_HOST_PORT, 'p', "123");
-        printf (" %s\n", "-q, --quiet");
-        printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("Offset to result in warning status (seconds)"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("Offset to result in critical status (seconds)"));
-        printf (" %s\n", "-o, --time_offset=INTEGER");
-        printf ("    %s\n", _("Expected offset of the ntp server relative to local server (seconds)"));
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf (UT_VERBOSE);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(UT_IPv46);
+        printf(UT_HOST_PORT, 'p', "123");
+        printf(" %s\n", "-q, --quiet");
+        printf("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("Offset to result in warning status (seconds)"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("Offset to result in critical status (seconds)"));
+        printf(" %s\n", "-o, --time_offset=INTEGER");
+        printf("    %s\n", _("Expected offset of the ntp server relative to local server (seconds)"));
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("This plugin checks the clock offset between the local host and a"));
@@ -641,13 +672,10 @@ void print_help(void){
         printf("%s\n", _("Examples:"));
         printf("  %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1"));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage(void)
-{
-        printf ("%s\n", _("Usage:"));
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
         printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-v verbose] [-o <time offset>]\n", progname);
 }
-
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 10c493b..3af6360 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_nwstat plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_nwstat plugin
-* 
-* This plugin attempts to contact the MRTGEXT NLM running on a
-* Novell server to gather the requested system information.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_nwstat plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_nwstat plugin
+ *
+ * This plugin attempts to contact the MRTGEXT NLM running on a
+ * Novell server to gather the requested system information.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_nwstat";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -44,10 +44,10 @@ enum checkvar {
         LOAD15,     /* check 15 minute CPU load */
         CONNS,      /* check number of connections */
         VPF,        /* check % free space on volume */
-        VMF,        /* check MB free space on volume */
-        VMU,        /* check MB used space on volume */
-        VPU,        /* check % used space on volume */
-        VMP,        /* check MB purgeable space on volume */
+        VMF,        /* check MB free space on volume */
+        VMU,        /* check MB used space on volume */
+        VPU,        /* check % used space on volume */
+        VMP,        /* check MB purgeable space on volume */
         VKF,        /* check KB free space on volume */
         LTCH,       /* check long-term cache hit percentage */
         CBUFF,      /* check total cache buffers */
@@ -55,7 +55,7 @@ enum checkvar {
         LRUM,       /* check LRU sitting time in minutes */
         DSDB,       /* check to see if DS Database is open */
         LOGINS,     /* check to see if logins are enabled */
-        NRMH,       /* check to see NRM Health Status */
+        NRMH,       /* check to see NRM Health Status */
         PUPRB,      /* check % of used packet receive buffers */
         UPRB,       /* check used packet receive buffers */
         SAPENTRIES, /* check SAP entries */
@@ -73,8 +73,8 @@ enum checkvar {
         DSVER,      /* check NDS version */
         UPTIME,     /* check server uptime */
         NLM,        /* check NLM loaded */
-        NRMP,       /* check NRM Process Values */
-        NRMM,       /* check NRM Memory Values */
+        NRMP,       /* check NRM Process Values */
+        NRMM,       /* check NRM Memory Values */
         NRMS,       /* check NRM Values */
         NSS1,       /* check Statistics from _Admin:Manage_NSS\GeneralStats.xml */
         NSS2,       /* check Statistics from _Admin:Manage_NSS\BufferCache.xml */
@@ -89,1652 +89,1439 @@ enum {
         PORT = 9999
 };
 
-char *server_address=NULL;
-char *volume_name=NULL;
-char *nlm_name=NULL;
-char *nrmp_name=NULL;
-char *nrmm_name=NULL;
-char *nrms_name=NULL;
-char *nss1_name=NULL;
-char *nss2_name=NULL;
-char *nss3_name=NULL;
-char *nss4_name=NULL;
-char *nss5_name=NULL;
-char *nss6_name=NULL;
-char *nss7_name=NULL;
-int server_port=PORT;
-unsigned long warning_value=0L;
-unsigned long critical_value=0L;
+char *server_address = NULL;
+char *volume_name = NULL;
+char *nlm_name = NULL;
+char *nrmp_name = NULL;
+char *nrmm_name = NULL;
+char *nrms_name = NULL;
+char *nss1_name = NULL;
+char *nss2_name = NULL;
+char *nss3_name = NULL;
+char *nss4_name = NULL;
+char *nss5_name = NULL;
+char *nss6_name = NULL;
+char *nss7_name = NULL;
+int server_port = PORT;
+unsigned long warning_value = 0L;
+unsigned long critical_value = 0L;
 bool check_warning_value = false;
 bool check_critical_value = false;
 bool check_netware_version = false;
 enum checkvar vars_to_check = NONE;
-int sap_number=-1;
+int sap_number = -1;
 
 int process_arguments(int, char **);
 void print_help(void);
 void print_usage(void);
 
-
-
-int
-main(int argc, char **argv) {
+int main(int argc, char **argv) {
         int result = STATE_UNKNOWN;
         int sd;
-        char *send_buffer=NULL;
+        char *send_buffer = NULL;
         char recv_buffer[MAX_INPUT_BUFFER];
-        char *output_message=NULL;
-        char *temp_buffer=NULL;
-        char *netware_version=NULL;
-
-        int time_sync_status=0;
-        int nrm_health_status=0;
-        unsigned long total_cache_buffers=0;
-        unsigned long dirty_cache_buffers=0;
-        unsigned long open_files=0;
-        unsigned long abended_threads=0;
-        unsigned long max_service_processes=0;
-        unsigned long current_service_processes=0;
-        unsigned long free_disk_space=0L;
-        unsigned long nrmp_value=0L;
-        unsigned long nrmm_value=0L;
-        unsigned long nrms_value=0L;
-        unsigned long nss1_value=0L;
-        unsigned long nss2_value=0L;
-        unsigned long nss3_value=0L;
-        unsigned long nss4_value=0L;
-        unsigned long nss5_value=0L;
-        unsigned long nss6_value=0L;
-        unsigned long nss7_value=0L;
-        unsigned long total_disk_space=0L;
-        unsigned long used_disk_space=0L;
-        unsigned long percent_used_disk_space=0L;
-        unsigned long purgeable_disk_space=0L;
-        unsigned long non_purgeable_disk_space=0L;
-        unsigned long percent_free_space=0;
-        unsigned long percent_purgeable_space=0;
-        unsigned long percent_non_purgeable_space=0;
-        unsigned long current_connections=0L;
-        unsigned long utilization=0L;
-        unsigned long cache_hits=0;
-        unsigned long cache_buffers=0L;
-        unsigned long lru_time=0L;
-        unsigned long max_packet_receive_buffers=0;
-        unsigned long used_packet_receive_buffers=0;
-        unsigned long percent_used_packet_receive_buffers=0L;
-        unsigned long sap_entries=0;
+        char *output_message = NULL;
+        char *temp_buffer = NULL;
+        char *netware_version = NULL;
+
+        int time_sync_status = 0;
+        int nrm_health_status = 0;
+        unsigned long total_cache_buffers = 0;
+        unsigned long dirty_cache_buffers = 0;
+        unsigned long open_files = 0;
+        unsigned long abended_threads = 0;
+        unsigned long max_service_processes = 0;
+        unsigned long current_service_processes = 0;
+        unsigned long free_disk_space = 0L;
+        unsigned long nrmp_value = 0L;
+        unsigned long nrmm_value = 0L;
+        unsigned long nrms_value = 0L;
+        unsigned long nss1_value = 0L;
+        unsigned long nss2_value = 0L;
+        unsigned long nss3_value = 0L;
+        unsigned long nss4_value = 0L;
+        unsigned long nss5_value = 0L;
+        unsigned long nss6_value = 0L;
+        unsigned long nss7_value = 0L;
+        unsigned long total_disk_space = 0L;
+        unsigned long used_disk_space = 0L;
+        unsigned long percent_used_disk_space = 0L;
+        unsigned long purgeable_disk_space = 0L;
+        unsigned long non_purgeable_disk_space = 0L;
+        unsigned long percent_free_space = 0;
+        unsigned long percent_purgeable_space = 0;
+        unsigned long percent_non_purgeable_space = 0;
+        unsigned long current_connections = 0L;
+        unsigned long utilization = 0L;
+        unsigned long cache_hits = 0;
+        unsigned long cache_buffers = 0L;
+        unsigned long lru_time = 0L;
+        unsigned long max_packet_receive_buffers = 0;
+        unsigned long used_packet_receive_buffers = 0;
+        unsigned long percent_used_packet_receive_buffers = 0L;
+        unsigned long sap_entries = 0;
         char uptime[MAX_INPUT_BUFFER];
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts(&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc,argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* initialize alarm signal handling */
-        signal(SIGALRM,socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
         alarm(socket_timeout);
 
         /* open connection */
-        my_tcp_connect (server_address, server_port, &sd);
+        my_tcp_connect(server_address, server_port, &sd);
 
         /* get OS version string */
         if (check_netware_version) {
-                send_buffer = strdup ("S19\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S19\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                if (!strcmp(recv_buffer,"-1\n"))
+                if (!strcmp(recv_buffer, "-1\n"))
                         netware_version = strdup("");
                 else {
-                        recv_buffer[strlen(recv_buffer)-1]=0;
-                        xasprintf (&netware_version,_("NetWare %s: "),recv_buffer);
+                        recv_buffer[strlen(recv_buffer) - 1] = 0;
+                        xasprintf(&netware_version, _("NetWare %s: "), recv_buffer);
                 }
         } else
                 netware_version = strdup("");
 
-
         /* check CPU load */
-        if (vars_to_check==LOAD1 || vars_to_check==LOAD5 || vars_to_check==LOAD15) {
+        if (vars_to_check == LOAD1 || vars_to_check == LOAD5 || vars_to_check == LOAD15) {
 
-                switch(vars_to_check) {
+                switch (vars_to_check) {
                 case LOAD1:
-                        temp_buffer = strdup ("1");
+                        temp_buffer = strdup("1");
                         break;
                 case LOAD5:
-                        temp_buffer = strdup ("5");
+                        temp_buffer = strdup("5");
                         break;
                 default:
-                        temp_buffer = strdup ("15");
+                        temp_buffer = strdup("15");
                         break;
                 }
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"UTIL%s\r\n",temp_buffer);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "UTIL%s\r\n", temp_buffer);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                utilization=strtoul(recv_buffer,NULL,10);
+                utilization = strtoul(recv_buffer, NULL, 10);
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("UPTIME\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("UPTIME\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                recv_buffer[strlen(recv_buffer)-1]=0;
-                sprintf(uptime,_("Up %s,"),recv_buffer);
+                recv_buffer[strlen(recv_buffer) - 1] = 0;
+                sprintf(uptime, _("Up %s,"), recv_buffer);
 
                 if (check_critical_value && utilization >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && utilization >= warning_value)
-                        result=STATE_WARNING;
-
-                xasprintf (&output_message,
-                          _("Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"),
-                          state_text(result),
-                          uptime,
-                          temp_buffer,
-                          utilization,
-                          temp_buffer,
-                          utilization,
-                          warning_value,
-                          critical_value);
+                        result = STATE_WARNING;
+
+                xasprintf(&output_message, _("Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"), state_text(result), uptime,
+                                  temp_buffer, utilization, temp_buffer, utilization, warning_value, critical_value);
 
                 /* check number of user connections */
-        } else if (vars_to_check==CONNS) {
+        } else if (vars_to_check == CONNS) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("CONNECT\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("CONNECT\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                current_connections=strtoul(recv_buffer,NULL,10);
+                current_connections = strtoul(recv_buffer, NULL, 10);
 
                 if (check_critical_value && current_connections >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && current_connections >= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                xasprintf (&output_message,
-                        _("Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"),
-                          state_text(result),
-                          current_connections,
-                          current_connections,
-                          warning_value,
-                          critical_value);
+                xasprintf(&output_message, _("Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"), state_text(result), current_connections,
+                                  current_connections, warning_value, critical_value);
 
                 /* check % long term cache hits */
-        } else if (vars_to_check==LTCH) {
+        } else if (vars_to_check == LTCH) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S1\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S1\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                cache_hits=atoi(recv_buffer);
+                cache_hits = atoi(recv_buffer);
 
                 if (check_critical_value && cache_hits <= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && cache_hits <= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                xasprintf (&output_message,
-                          _("%s: Long term cache hits = %lu%%"),
-                          state_text(result),
-                          cache_hits);
+                xasprintf(&output_message, _("%s: Long term cache hits = %lu%%"), state_text(result), cache_hits);
 
                 /* check cache buffers */
-        } else if (vars_to_check==CBUFF) {
+        } else if (vars_to_check == CBUFF) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S2\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S2\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                cache_buffers=strtoul(recv_buffer,NULL,10);
+                cache_buffers = strtoul(recv_buffer, NULL, 10);
 
                 if (check_critical_value && cache_buffers <= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && cache_buffers <= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                xasprintf (&output_message,
-                          _("%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"),
-                          state_text(result),
-                          cache_buffers,
-                          cache_buffers,
-                          warning_value,
-                          critical_value);
+                xasprintf(&output_message, _("%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"), state_text(result), cache_buffers,
+                                  cache_buffers, warning_value, critical_value);
 
                 /* check dirty cache buffers */
-        } else if (vars_to_check==CDBUFF) {
+        } else if (vars_to_check == CDBUFF) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S3\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S3\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                cache_buffers=strtoul(recv_buffer,NULL,10);
+                cache_buffers = strtoul(recv_buffer, NULL, 10);
 
                 if (check_critical_value && cache_buffers >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && cache_buffers >= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                xasprintf (&output_message,
-                          _("%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"),
-                          state_text(result),
-                          cache_buffers,
-                          cache_buffers,
-                          warning_value,
-                          critical_value);
+                xasprintf(&output_message, _("%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"), state_text(result), cache_buffers,
+                                  cache_buffers, warning_value, critical_value);
 
                 /* check LRU sitting time in minutes */
-        } else if (vars_to_check==LRUM) {
+        } else if (vars_to_check == LRUM) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S5\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S5\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                lru_time=strtoul(recv_buffer,NULL,10);
+                lru_time = strtoul(recv_buffer, NULL, 10);
 
                 if (check_critical_value && lru_time <= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && lru_time <= warning_value)
-                        result=STATE_WARNING;
-
-                xasprintf (&output_message,
-                          _("%s: LRU sitting time = %lu minutes"),
-                          state_text(result),
-                          lru_time);
+                        result = STATE_WARNING;
 
+                xasprintf(&output_message, _("%s: LRU sitting time = %lu minutes"), state_text(result), lru_time);
 
                 /* check KB free space on volume */
-        } else if (vars_to_check==VKF) {
+        } else if (vars_to_check == VKF) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"VKF%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VKF%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        free_disk_space=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        free_disk_space = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && free_disk_space <= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && free_disk_space <= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"),
-                                 (result==STATE_OK)?"":_("Only "),
-                                 free_disk_space,
-                                 volume_name,
-                                 volume_name,
-                                 free_disk_space,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
+                                          free_disk_space, volume_name, volume_name, free_disk_space, warning_value, critical_value);
                 }
 
                 /* check MB free space on volume */
-        } else if (vars_to_check==VMF) {
+        } else if (vars_to_check == VMF) {
 
-                xasprintf (&send_buffer,"VMF%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VMF%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        free_disk_space=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        free_disk_space = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && free_disk_space <= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && free_disk_space <= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"),
-                                 (result==STATE_OK)?"":_("Only "),
-                                 free_disk_space,
-                                 volume_name,
-                                 volume_name,
-                                 free_disk_space,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
+                                          free_disk_space, volume_name, volume_name, free_disk_space, warning_value, critical_value);
                 }
                 /* check MB used space on volume */
-        } else if (vars_to_check==VMU) {
+        } else if (vars_to_check == VMU) {
 
-                xasprintf (&send_buffer,"VMU%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VMU%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        free_disk_space=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        free_disk_space = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && free_disk_space <= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && free_disk_space <= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"),
-                                 (result==STATE_OK)?"":_("Only "),
-                                 free_disk_space,
-                                 volume_name,
-                                 volume_name,
-                                 free_disk_space,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
+                                          free_disk_space, volume_name, volume_name, free_disk_space, warning_value, critical_value);
                 }
                 /* check % used space on volume */
-        } else if (vars_to_check==VPU) {
+        } else if (vars_to_check == VPU) {
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                asprintf (&send_buffer,"VMU%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                asprintf(&send_buffer, "VMU%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
 
-                if (result!=STATE_OK)
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        asprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
 
                 } else {
-                        used_disk_space=strtoul(recv_buffer,NULL,10);
+                        used_disk_space = strtoul(recv_buffer, NULL, 10);
                         close(sd);
-                        my_tcp_connect (server_address, server_port, &sd);
+                        my_tcp_connect(server_address, server_port, &sd);
                         /* get total volume in MB */
-                        asprintf (&send_buffer,"VMS%s\r\n",volume_name);
-                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                        if (result!=STATE_OK)
+                        asprintf(&send_buffer, "VMS%s\r\n", volume_name);
+                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                        if (result != STATE_OK)
                                 return result;
-                        total_disk_space=strtoul(recv_buffer,NULL,10);
+                        total_disk_space = strtoul(recv_buffer, NULL, 10);
                         /* calculate percent used on volume */
-                        percent_used_disk_space=(unsigned long)(((double)used_disk_space/(double)total_disk_space)*100.0);
+                        percent_used_disk_space = (unsigned long)(((double)used_disk_space / (double)total_disk_space) * 100.0);
 
                         if (check_critical_value && percent_used_disk_space >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && percent_used_disk_space >= warning_value)
-                                result=STATE_WARNING;
-
-                        asprintf (&output_message,_("%lu MB (%lu%%) used on volume %s - total %lu MB|Used space in percent on %s=%lu;%lu;%lu;0;100"),
-                                used_disk_space,
-                                percent_used_disk_space,
-                                volume_name,
-                                total_disk_space,
-                                volume_name,
-                                percent_used_disk_space,
-                                warning_value,
-                                critical_value
-                                );
+                                result = STATE_WARNING;
+
+                        asprintf(&output_message, _("%lu MB (%lu%%) used on volume %s - total %lu MB|Used space in percent on %s=%lu;%lu;%lu;0;100"),
+                                         used_disk_space, percent_used_disk_space, volume_name, total_disk_space, volume_name, percent_used_disk_space,
+                                         warning_value, critical_value);
                 }
 
                 /* check % free space on volume */
-        } else if (vars_to_check==VPF) {
+        } else if (vars_to_check == VPF) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"VKF%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VKF%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
+                if (!strcmp(recv_buffer, "-1\n")) {
 
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
 
                 } else {
 
-                        free_disk_space=strtoul(recv_buffer,NULL,10);
+                        free_disk_space = strtoul(recv_buffer, NULL, 10);
 
                         close(sd);
-                        my_tcp_connect (server_address, server_port, &sd);
+                        my_tcp_connect(server_address, server_port, &sd);
 
-                        xasprintf (&send_buffer,"VKS%s\r\n",volume_name);
-                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                        if (result!=STATE_OK)
+                        xasprintf(&send_buffer, "VKS%s\r\n", volume_name);
+                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                        if (result != STATE_OK)
                                 return result;
-                        total_disk_space=strtoul(recv_buffer,NULL,10);
+                        total_disk_space = strtoul(recv_buffer, NULL, 10);
 
-                        percent_free_space=(unsigned long)(((double)free_disk_space/(double)total_disk_space)*100.0);
+                        percent_free_space = (unsigned long)(((double)free_disk_space / (double)total_disk_space) * 100.0);
 
                         if (check_critical_value && percent_free_space <= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && percent_free_space <= warning_value)
-                                result=STATE_WARNING;
-                        free_disk_space/=1024;
-                        total_disk_space/=1024;
-                        xasprintf (&output_message,_("%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100"),
-                                free_disk_space,
-                                percent_free_space,
-                                volume_name,
-                                total_disk_space,
-                                volume_name,
-                                percent_free_space,
-                                warning_value,
-                                critical_value
-                                );
+                                result = STATE_WARNING;
+                        free_disk_space /= 1024;
+                        total_disk_space /= 1024;
+                        xasprintf(&output_message, _("%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100"), free_disk_space,
+                                          percent_free_space, volume_name, total_disk_space, volume_name, percent_free_space, warning_value, critical_value);
                 }
 
                 /* check to see if DS Database is open or closed */
-        } else if (vars_to_check==DSDB) {
+        } else if (vars_to_check == DSDB) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S11\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S11\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                if (atoi(recv_buffer)==1)
-                        result=STATE_OK;
+                if (atoi(recv_buffer) == 1)
+                        result = STATE_OK;
                 else
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S13\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                temp_buffer=strtok(recv_buffer,"\r\n");
+                send_buffer = strdup("S13\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                temp_buffer = strtok(recv_buffer, "\r\n");
 
-                xasprintf (&output_message,_("Directory Services Database is %s (DS version %s)"),(result==STATE_OK)?"open":"closed",temp_buffer);
+                xasprintf(&output_message, _("Directory Services Database is %s (DS version %s)"), (result == STATE_OK) ? "open" : "closed",
+                                  temp_buffer);
 
                 /* check to see if logins are enabled */
-        } else if (vars_to_check==LOGINS) {
+        } else if (vars_to_check == LOGINS) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S12\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S12\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                if (atoi(recv_buffer)==1)
-                        result=STATE_OK;
+                if (atoi(recv_buffer) == 1)
+                        result = STATE_OK;
                 else
-                        result=STATE_WARNING;
-
-                xasprintf (&output_message,_("Logins are %s"),(result==STATE_OK)?_("enabled"):_("disabled"));
+                        result = STATE_WARNING;
 
+                xasprintf(&output_message, _("Logins are %s"), (result == STATE_OK) ? _("enabled") : _("disabled"));
 
                 /* check NRM Health Status Summary*/
-        } else if (vars_to_check==NRMH) {
+        } else if (vars_to_check == NRMH) {
 
-                xasprintf (&send_buffer,"NRMH\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NRMH\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                nrm_health_status=atoi(recv_buffer);
+                nrm_health_status = atoi(recv_buffer);
 
-                if (nrm_health_status==2) {
-                        result=STATE_OK;
-                        xasprintf (&output_message,_("CRITICAL - NRM Status is bad!"));
-                }
-                else {
-                        if (nrm_health_status==1) {
-                                result=STATE_WARNING;
-                                xasprintf (&output_message,_("Warning - NRM Status is suspect!"));
+                if (nrm_health_status == 2) {
+                        result = STATE_OK;
+                        xasprintf(&output_message, _("CRITICAL - NRM Status is bad!"));
+                } else {
+                        if (nrm_health_status == 1) {
+                                result = STATE_WARNING;
+                                xasprintf(&output_message, _("Warning - NRM Status is suspect!"));
                         }
 
-                        xasprintf (&output_message,_("OK - NRM Status is good!"));
+                        xasprintf(&output_message, _("OK - NRM Status is good!"));
                 }
 
-
-
                 /* check packet receive buffers */
-        } else if (vars_to_check==UPRB || vars_to_check==PUPRB) {
+        } else if (vars_to_check == UPRB || vars_to_check == PUPRB) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S15\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S15\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                used_packet_receive_buffers=atoi(recv_buffer);
+                used_packet_receive_buffers = atoi(recv_buffer);
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S16\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S16\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                max_packet_receive_buffers=atoi(recv_buffer);
+                max_packet_receive_buffers = atoi(recv_buffer);
 
-                percent_used_packet_receive_buffers=(unsigned long)(((double)used_packet_receive_buffers/(double)max_packet_receive_buffers)*100.0);
+                percent_used_packet_receive_buffers =
+                        (unsigned long)(((double)used_packet_receive_buffers / (double)max_packet_receive_buffers) * 100.0);
 
-                if (vars_to_check==UPRB) {
+                if (vars_to_check == UPRB) {
                         if (check_critical_value && used_packet_receive_buffers >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && used_packet_receive_buffers >= warning_value)
-                                result=STATE_WARNING;
+                                result = STATE_WARNING;
                 } else {
                         if (check_critical_value && percent_used_packet_receive_buffers >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && percent_used_packet_receive_buffers >= warning_value)
-                                result=STATE_WARNING;
+                                result = STATE_WARNING;
                 }
 
-                xasprintf (&output_message,_("%lu of %lu (%lu%%) packet receive buffers used"),used_packet_receive_buffers,max_packet_receive_buffers,percent_used_packet_receive_buffers);
+                xasprintf(&output_message, _("%lu of %lu (%lu%%) packet receive buffers used"), used_packet_receive_buffers,
+                                  max_packet_receive_buffers, percent_used_packet_receive_buffers);
 
                 /* check SAP table entries */
-        } else if (vars_to_check==SAPENTRIES) {
+        } else if (vars_to_check == SAPENTRIES) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                if (sap_number==-1)
-                        xasprintf (&send_buffer,"S9\r\n");
+                if (sap_number == -1)
+                        xasprintf(&send_buffer, "S9\r\n");
                 else
-                        xasprintf (&send_buffer,"S9.%d\r\n",sap_number);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                        xasprintf(&send_buffer, "S9.%d\r\n", sap_number);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                sap_entries=atoi(recv_buffer);
+                sap_entries = atoi(recv_buffer);
 
                 if (check_critical_value && sap_entries >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && sap_entries >= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                if (sap_number==-1)
-                        xasprintf (&output_message,_("%lu entries in SAP table"),sap_entries);
+                if (sap_number == -1)
+                        xasprintf(&output_message, _("%lu entries in SAP table"), sap_entries);
                 else
-                        xasprintf (&output_message,_("%lu entries in SAP table for SAP type %d"),sap_entries,sap_number);
+                        xasprintf(&output_message, _("%lu entries in SAP table for SAP type %d"), sap_entries, sap_number);
 
                 /* check KB purgeable space on volume */
-        } else if (vars_to_check==VKP) {
+        } else if (vars_to_check == VKP) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"VKP%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VKP%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
                 } else {
-                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+                        purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && purgeable_disk_space >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && purgeable_disk_space >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,_("%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"),
-                                 (result==STATE_OK)?"":_("Only "),
-                                 purgeable_disk_space,
-                                 volume_name,
-                                 volume_name,
-                                 purgeable_disk_space,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
+                                          purgeable_disk_space, volume_name, volume_name, purgeable_disk_space, warning_value, critical_value);
                 }
                 /* check MB purgeable space on volume */
-        } else if (vars_to_check==VMP) {
+        } else if (vars_to_check == VMP) {
 
-                xasprintf (&send_buffer,"VMP%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VMP%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
                 } else {
-                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+                        purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && purgeable_disk_space >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && purgeable_disk_space >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,_("%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"),
-                                 (result==STATE_OK)?"":_("Only "),
-                                 purgeable_disk_space,
-                                 volume_name,
-                                 volume_name,
-                                 purgeable_disk_space,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
+                                          purgeable_disk_space, volume_name, volume_name, purgeable_disk_space, warning_value, critical_value);
                 }
 
                 /* check % purgeable space on volume */
-        } else if (vars_to_check==VPP) {
+        } else if (vars_to_check == VPP) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"VKP%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VKP%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
+                if (!strcmp(recv_buffer, "-1\n")) {
 
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
 
                 } else {
 
-                        purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+                        purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
 
                         close(sd);
-                        my_tcp_connect (server_address, server_port, &sd);
+                        my_tcp_connect(server_address, server_port, &sd);
 
-                        xasprintf (&send_buffer,"VKS%s\r\n",volume_name);
-                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                        if (result!=STATE_OK)
+                        xasprintf(&send_buffer, "VKS%s\r\n", volume_name);
+                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                        if (result != STATE_OK)
                                 return result;
-                        total_disk_space=strtoul(recv_buffer,NULL,10);
+                        total_disk_space = strtoul(recv_buffer, NULL, 10);
 
-                        percent_purgeable_space=(unsigned long)(((double)purgeable_disk_space/(double)total_disk_space)*100.0);
+                        percent_purgeable_space = (unsigned long)(((double)purgeable_disk_space / (double)total_disk_space) * 100.0);
 
                         if (check_critical_value && percent_purgeable_space >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && percent_purgeable_space >= warning_value)
-                                result=STATE_WARNING;
-                        purgeable_disk_space/=1024;
-                        xasprintf (&output_message,_("%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"),
-                                        purgeable_disk_space,
-                                        percent_purgeable_space,
-                                        volume_name,
-                                        volume_name,
-                                        percent_purgeable_space,
-                                        warning_value,
-                                        critical_value
-                                        );
+                                result = STATE_WARNING;
+                        purgeable_disk_space /= 1024;
+                        xasprintf(&output_message, _("%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"), purgeable_disk_space,
+                                          percent_purgeable_space, volume_name, volume_name, percent_purgeable_space, warning_value, critical_value);
                 }
 
                 /* check KB not yet purgeable space on volume */
-        } else if (vars_to_check==VKNP) {
+        } else if (vars_to_check == VKNP) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"VKNP%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VKNP%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
                 } else {
-                        non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+                        non_purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && non_purgeable_disk_space >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && non_purgeable_disk_space >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,_("%s%lu KB not yet purgeable on volume %s"),(result==STATE_OK)?"":_("Only "),non_purgeable_disk_space,volume_name);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s%lu KB not yet purgeable on volume %s"), (result == STATE_OK) ? "" : _("Only "),
+                                          non_purgeable_disk_space, volume_name);
                 }
 
                 /* check % not yet purgeable space on volume */
-        } else if (vars_to_check==VPNP) {
+        } else if (vars_to_check == VPNP) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"VKNP%s\r\n",volume_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "VKNP%s\r\n", volume_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
+                if (!strcmp(recv_buffer, "-1\n")) {
 
-                        xasprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
-                        result=STATE_CRITICAL;
+                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
+                        result = STATE_CRITICAL;
 
                 } else {
 
-                        non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
+                        non_purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
 
                         close(sd);
-                        my_tcp_connect (server_address, server_port, &sd);
+                        my_tcp_connect(server_address, server_port, &sd);
 
-                        xasprintf (&send_buffer,"VKS%s\r\n",volume_name);
-                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                        if (result!=STATE_OK)
+                        xasprintf(&send_buffer, "VKS%s\r\n", volume_name);
+                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                        if (result != STATE_OK)
                                 return result;
-                        total_disk_space=strtoul(recv_buffer,NULL,10);
+                        total_disk_space = strtoul(recv_buffer, NULL, 10);
 
-                        percent_non_purgeable_space=(unsigned long)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0);
+                        percent_non_purgeable_space = (unsigned long)(((double)non_purgeable_disk_space / (double)total_disk_space) * 100.0);
 
                         if (check_critical_value && percent_non_purgeable_space >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && percent_non_purgeable_space >= warning_value)
-                                result=STATE_WARNING;
-                        purgeable_disk_space/=1024;
-                        xasprintf (&output_message,_("%lu MB (%lu%%) not yet purgeable on volume %s"),non_purgeable_disk_space,percent_non_purgeable_space,volume_name);
+                                result = STATE_WARNING;
+                        purgeable_disk_space /= 1024;
+                        xasprintf(&output_message, _("%lu MB (%lu%%) not yet purgeable on volume %s"), non_purgeable_disk_space,
+                                          percent_non_purgeable_space, volume_name);
                 }
 
                 /* check # of open files */
-        } else if (vars_to_check==OFILES) {
+        } else if (vars_to_check == OFILES) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S18\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S18\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                open_files=atoi(recv_buffer);
+                open_files = atoi(recv_buffer);
 
                 if (check_critical_value && open_files >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && open_files >= warning_value)
-                        result=STATE_WARNING;
-
-                xasprintf (&output_message,_("%lu open files|Openfiles=%lu;%lu;%lu;0,0"),
-                                open_files,
-                                open_files,
-                                warning_value,
-                                critical_value);
+                        result = STATE_WARNING;
 
+                xasprintf(&output_message, _("%lu open files|Openfiles=%lu;%lu;%lu;0,0"), open_files, open_files, warning_value, critical_value);
 
                 /* check # of abended threads (Netware > 5.x only) */
-        } else if (vars_to_check==ABENDS) {
+        } else if (vars_to_check == ABENDS) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S17\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S17\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                abended_threads=atoi(recv_buffer);
+                abended_threads = atoi(recv_buffer);
 
                 if (check_critical_value && abended_threads >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && abended_threads >= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                xasprintf (&output_message,_("%lu abended threads|Abends=%lu;%lu;%lu;;"),
-                                abended_threads,
-                                abended_threads,
-                                warning_value,
-                                critical_value);
+                xasprintf(&output_message, _("%lu abended threads|Abends=%lu;%lu;%lu;;"), abended_threads, abended_threads, warning_value,
+                                  critical_value);
 
                 /* check # of current service processes (Netware 5.x only) */
-        } else if (vars_to_check==CSPROCS) {
+        } else if (vars_to_check == CSPROCS) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S20\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S20\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                max_service_processes=atoi(recv_buffer);
+                max_service_processes = atoi(recv_buffer);
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S21\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S21\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                current_service_processes=atoi(recv_buffer);
+                current_service_processes = atoi(recv_buffer);
 
                 if (check_critical_value && current_service_processes >= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && current_service_processes >= warning_value)
-                        result=STATE_WARNING;
+                        result = STATE_WARNING;
 
-                xasprintf (&output_message,
-                          _("%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"),
-                          current_service_processes,
-                          max_service_processes,
-                          current_service_processes,
-                          warning_value,
-                          critical_value,
-                          max_service_processes);
+                xasprintf(&output_message, _("%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"), current_service_processes,
+                                  max_service_processes, current_service_processes, warning_value, critical_value, max_service_processes);
 
                 /* check # Timesync Status */
-        } else if (vars_to_check==TSYNC) {
+        } else if (vars_to_check == TSYNC) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S22\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S22\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                time_sync_status=atoi(recv_buffer);
+                time_sync_status = atoi(recv_buffer);
 
-                if (time_sync_status==0) {
-                        result=STATE_CRITICAL;
-                        xasprintf (&output_message,_("CRITICAL - Time not in sync with network!"));
-                }
-                else {
-                        xasprintf (&output_message,_("OK - Time in sync with network!"));
+                if (time_sync_status == 0) {
+                        result = STATE_CRITICAL;
+                        xasprintf(&output_message, _("CRITICAL - Time not in sync with network!"));
+                } else {
+                        xasprintf(&output_message, _("OK - Time in sync with network!"));
                 }
 
-
-
-
-
                 /* check LRU sitting time in secondss */
-        } else if (vars_to_check==LRUS) {
+        } else if (vars_to_check == LRUS) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S4\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S4\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                lru_time=strtoul(recv_buffer,NULL,10);
+                lru_time = strtoul(recv_buffer, NULL, 10);
 
                 if (check_critical_value && lru_time <= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && lru_time <= warning_value)
-                        result=STATE_WARNING;
-                xasprintf (&output_message,_("LRU sitting time = %lu seconds"),lru_time);
-
+                        result = STATE_WARNING;
+                xasprintf(&output_message, _("LRU sitting time = %lu seconds"), lru_time);
 
                 /* check % dirty cacheobuffers as a percentage of the total*/
-        } else if (vars_to_check==DCB) {
+        } else if (vars_to_check == DCB) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S6\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S6\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                dirty_cache_buffers=atoi(recv_buffer);
+                dirty_cache_buffers = atoi(recv_buffer);
 
                 if (check_critical_value && dirty_cache_buffers <= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && dirty_cache_buffers <= warning_value)
-                        result=STATE_WARNING;
-                xasprintf (&output_message,_("Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"),
-                                dirty_cache_buffers,
-                                dirty_cache_buffers,
-                                warning_value,
-                                critical_value);
+                        result = STATE_WARNING;
+                xasprintf(&output_message, _("Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"), dirty_cache_buffers,
+                                  dirty_cache_buffers, warning_value, critical_value);
 
                 /* check % total cache buffers as a percentage of the original*/
-        } else if (vars_to_check==TCB) {
+        } else if (vars_to_check == TCB) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                send_buffer = strdup ("S7\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                send_buffer = strdup("S7\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
-                total_cache_buffers=atoi(recv_buffer);
+                total_cache_buffers = atoi(recv_buffer);
 
                 if (check_critical_value && total_cache_buffers <= critical_value)
-                        result=STATE_CRITICAL;
+                        result = STATE_CRITICAL;
                 else if (check_warning_value && total_cache_buffers <= warning_value)
-                        result=STATE_WARNING;
-                xasprintf (&output_message,_("Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"),
-                                total_cache_buffers,
-                                total_cache_buffers,
-                                warning_value,
-                                critical_value);
+                        result = STATE_WARNING;
+                xasprintf(&output_message, _("Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"), total_cache_buffers,
+                                  total_cache_buffers, warning_value, critical_value);
 
-        } else if (vars_to_check==DSVER) {
+        } else if (vars_to_check == DSVER) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S13\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S13\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                recv_buffer[strlen(recv_buffer)-1]=0;
+                recv_buffer[strlen(recv_buffer) - 1] = 0;
 
-                xasprintf (&output_message,_("NDS Version %s"),recv_buffer);
+                xasprintf(&output_message, _("NDS Version %s"), recv_buffer);
 
-        } else if (vars_to_check==UPTIME) {
+        } else if (vars_to_check == UPTIME) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
-
-                xasprintf (&send_buffer,"UPTIME\r\n");
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
-                        return result;
+                my_tcp_connect(server_address, server_port, &sd);
 
+                xasprintf(&send_buffer, "UPTIME\r\n");
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
+                        return result;
 
-                recv_buffer[sizeof(recv_buffer)-1]=0;
-                recv_buffer[strlen(recv_buffer)-1]=0;
+                recv_buffer[sizeof(recv_buffer) - 1] = 0;
+                recv_buffer[strlen(recv_buffer) - 1] = 0;
 
-                xasprintf (&output_message,_("Up %s"),recv_buffer);
+                xasprintf(&output_message, _("Up %s"), recv_buffer);
 
-        } else if (vars_to_check==NLM) {
+        } else if (vars_to_check == NLM) {
 
                 close(sd);
-                my_tcp_connect (server_address, server_port, &sd);
+                my_tcp_connect(server_address, server_port, &sd);
 
-                xasprintf (&send_buffer,"S24:%s\r\n",nlm_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "S24:%s\r\n", nlm_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                recv_buffer[strlen(recv_buffer)-1]=0;
-                if (strcmp(recv_buffer,"-1")) {
-                        xasprintf (&output_message,_("Module %s version %s is loaded"),nlm_name,recv_buffer);
+                recv_buffer[strlen(recv_buffer) - 1] = 0;
+                if (strcmp(recv_buffer, "-1")) {
+                        xasprintf(&output_message, _("Module %s version %s is loaded"), nlm_name, recv_buffer);
                 } else {
-                        result=STATE_CRITICAL;
-                        xasprintf (&output_message,_("Module %s is not loaded"),nlm_name);
-
-                        }
-        } else if (vars_to_check==NRMP) {
+                        result = STATE_CRITICAL;
+                        xasprintf(&output_message, _("Module %s is not loaded"), nlm_name);
+                }
+        } else if (vars_to_check == NRMP) {
 
-                xasprintf (&send_buffer,"NRMP:%s\r\n",nrmp_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NRMP:%s\r\n", nrmp_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nrmp_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nrmp_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nrmp_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nrmp_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nrmp_value <= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nrmp_value <= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nrmp_name,
-                                 nrmp_value,
-                                 nrmp_name,
-                                 nrmp_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nrmp_name, nrmp_value, nrmp_name, nrmp_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NRMM) {
+        } else if (vars_to_check == NRMM) {
 
-                xasprintf (&send_buffer,"NRMM:%s\r\n",nrmm_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NRMM:%s\r\n", nrmm_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nrmm_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nrmm_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nrmm_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nrmm_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nrmm_value <= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nrmm_value <= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nrmm_name,
-                                 nrmm_value,
-                                 nrmm_name,
-                                 nrmm_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nrmm_name, nrmm_value, nrmm_name, nrmm_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NRMS) {
+        } else if (vars_to_check == NRMS) {
 
-                xasprintf (&send_buffer,"NRMS:%s\r\n",nrms_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NRMS:%s\r\n", nrms_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nrms_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nrms_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nrms_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nrms_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nrms_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nrms_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nrms_name,
-                                 nrms_value,
-                                 nrms_name,
-                                 nrms_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nrms_name, nrms_value, nrms_name, nrms_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS1) {
+        } else if (vars_to_check == NSS1) {
 
-                xasprintf (&send_buffer,"NSS1:%s\r\n",nss1_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS1:%s\r\n", nss1_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss1_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss1_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss1_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss1_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss1_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss1_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss1_name,
-                                 nss1_value,
-                                 nss1_name,
-                                 nss1_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss1_name, nss1_value, nss1_name, nss1_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS2) {
+        } else if (vars_to_check == NSS2) {
 
-                xasprintf (&send_buffer,"NSS2:%s\r\n",nss2_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS2:%s\r\n", nss2_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss2_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss2_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss2_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss2_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss2_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss2_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss2_name,
-                                 nss2_value,
-                                 nss2_name,
-                                 nss2_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss2_name, nss2_value, nss2_name, nss2_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS3) {
+        } else if (vars_to_check == NSS3) {
 
-                xasprintf (&send_buffer,"NSS3:%s\r\n",nss3_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS3:%s\r\n", nss3_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss3_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss3_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss3_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss3_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss3_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss3_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss3_name,
-                                 nss3_value,
-                                 nss3_name,
-                                 nss3_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss3_name, nss3_value, nss3_name, nss3_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS4) {
+        } else if (vars_to_check == NSS4) {
 
-                xasprintf (&send_buffer,"NSS4:%s\r\n",nss4_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS4:%s\r\n", nss4_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss4_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss4_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss4_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss4_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss4_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss4_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss4_name,
-                                 nss4_value,
-                                 nss4_name,
-                                 nss4_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss4_name, nss4_value, nss4_name, nss4_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS5) {
+        } else if (vars_to_check == NSS5) {
 
-                xasprintf (&send_buffer,"NSS5:%s\r\n",nss5_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS5:%s\r\n", nss5_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss5_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss5_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss5_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss5_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss5_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss5_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss5_name,
-                                 nss5_value,
-                                 nss5_name,
-                                 nss5_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss5_name, nss5_value, nss5_name, nss5_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS6) {
+        } else if (vars_to_check == NSS6) {
 
-                xasprintf (&send_buffer,"NSS6:%s\r\n",nss6_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS6:%s\r\n", nss6_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss6_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss6_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss6_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss6_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss6_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss6_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss6_name,
-                                 nss6_value,
-                                 nss6_name,
-                                 nss6_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss6_name, nss6_value, nss6_name, nss6_value, warning_value,
+                                          critical_value);
                 }
 
-        } else if (vars_to_check==NSS7) {
+        } else if (vars_to_check == NSS7) {
 
-                xasprintf (&send_buffer,"NSS7:%s\r\n",nss7_name);
-                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
-                if (result!=STATE_OK)
+                xasprintf(&send_buffer, "NSS7:%s\r\n", nss7_name);
+                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
+                if (result != STATE_OK)
                         return result;
 
-                if (!strcmp(recv_buffer,"-1\n")) {
-                        xasprintf (&output_message,_("CRITICAL - Value '%s' does not exist!"),nss7_name);
-                        result=STATE_CRITICAL;
-                }       else {
-                        nss7_value=strtoul(recv_buffer,NULL,10);
+                if (!strcmp(recv_buffer, "-1\n")) {
+                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss7_name);
+                        result = STATE_CRITICAL;
+                } else {
+                        nss7_value = strtoul(recv_buffer, NULL, 10);
                         if (check_critical_value && nss7_value >= critical_value)
-                                result=STATE_CRITICAL;
+                                result = STATE_CRITICAL;
                         else if (check_warning_value && nss7_value >= warning_value)
-                                result=STATE_WARNING;
-                        xasprintf (&output_message,
-                                  _("%s is  %lu|%s=%lu;%lu;%lu;;"),
-                                 nss7_name,
-                                 nss7_value,
-                                 nss7_name,
-                                 nss7_value,
-                                 warning_value,
-                                 critical_value);
+                                result = STATE_WARNING;
+                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss7_name, nss7_value, nss7_name, nss7_value, warning_value,
+                                          critical_value);
                 }
 
+        } else {
 
-}
-        else {
-
-                output_message = strdup (_("Nothing to check!\n"));
-                result=STATE_UNKNOWN;
-
+                output_message = strdup(_("Nothing to check!\n"));
+                result = STATE_UNKNOWN;
         }
 
-        close (sd);
+        close(sd);
 
         /* reset timeout */
         alarm(0);
 
-        printf("%s%s\n",netware_version,output_message);
+        printf("%s%s\n", netware_version, output_message);
 
         return result;
 }
 
-
-
 /* process command-line arguments */
 int process_arguments(int argc, char **argv) {
         int c;
 
         int option = 0;
-        static struct option longopts[] =
-                {
-                        {"port",     required_argument,0,'p'},
-                        {"timeout",  required_argument,0,'t'},
-                        {"critical", required_argument,0,'c'},
-                        {"warning",  required_argument,0,'w'},
-                        {"variable", required_argument,0,'v'},
-                        {"hostname", required_argument,0,'H'},
-                        {"osversion",no_argument,      0,'o'},
-                        {"version",  no_argument,      0,'V'},
-                        {"help",     no_argument,      0,'h'},
-                        {0,0,0,0}
-                };
+        static struct option longopts[] = {{"port", required_argument, 0, 'p'},     {"timeout", required_argument, 0, 't'},
+                                                                           {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},
+                                                                           {"variable", required_argument, 0, 'v'}, {"hostname", required_argument, 0, 'H'},
+                                                                           {"osversion", no_argument, 0, 'o'},      {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
 
         /* no options were supplied */
-        if (argc<2) return ERROR;
+        if (argc < 2)
+                return ERROR;
 
         /* backwards compatibility */
-        if (! is_option(argv[1])) {
-                server_address=argv[1];
-                argv[1]=argv[0];
-                argv=&argv[1];
+        if (!is_option(argv[1])) {
+                server_address = argv[1];
+                argv[1] = argv[0];
+                argv = &argv[1];
                 argc--;
         }
 
-  for (c=1;c<argc;c++) {
-    if (strcmp("-to",argv[c])==0)
-      strcpy(argv[c],"-t");
-    else if (strcmp("-wv",argv[c])==0)
-      strcpy(argv[c],"-w");
-    else if (strcmp("-cv",argv[c])==0)
-      strcpy(argv[c],"-c");
+        for (c = 1; c < argc; c++) {
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+                else if (strcmp("-wv", argv[c]) == 0)
+                        strcpy(argv[c], "-w");
+                else if (strcmp("-cv", argv[c]) == 0)
+                        strcpy(argv[c], "-c");
         }
 
         while (1) {
-                c = getopt_long(argc,argv,"+hoVH:t:c:w:p:v:",longopts,&option);
+                c = getopt_long(argc, argv, "+hoVH:t:c:w:p:v:", longopts, &option);
 
-                if (c==-1||c==EOF||c==1)
+                if (c == -1 || c == EOF || c == 1)
                         break;
 
-                switch (c)
-                        {
-                        case '?': /* print short usage statement if args not parsable */
-                        usage5 ();
-                        case 'h': /* help */
-                                print_help();
-                                exit(STATE_UNKNOWN);
-                        case 'V': /* version */
-                                print_revision(progname, NP_VERSION);
-                                exit(STATE_UNKNOWN);
-                        case 'H': /* hostname */
-                                server_address=optarg;
-                                break;
-                        case 'o': /* display nos version */
-                                check_netware_version = true;
-                                break;
-                        case 'p': /* port */
-                                if (is_intnonneg(optarg))
-                                        server_port=atoi(optarg);
+                switch (c) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'H': /* hostname */
+                        server_address = optarg;
+                        break;
+                case 'o': /* display nos version */
+                        check_netware_version = true;
+                        break;
+                case 'p': /* port */
+                        if (is_intnonneg(optarg))
+                                server_port = atoi(optarg);
+                        else
+                                die(STATE_UNKNOWN, _("Server port an integer\n"));
+                        break;
+                case 'v':
+                        if (strlen(optarg) < 3)
+                                return ERROR;
+                        if (!strcmp(optarg, "LOAD1"))
+                                vars_to_check = LOAD1;
+                        else if (!strcmp(optarg, "LOAD5"))
+                                vars_to_check = LOAD5;
+                        else if (!strcmp(optarg, "LOAD15"))
+                                vars_to_check = LOAD15;
+                        else if (!strcmp(optarg, "CONNS"))
+                                vars_to_check = CONNS;
+                        else if (!strcmp(optarg, "LTCH"))
+                                vars_to_check = LTCH;
+                        else if (!strcmp(optarg, "DCB"))
+                                vars_to_check = DCB;
+                        else if (!strcmp(optarg, "TCB"))
+                                vars_to_check = TCB;
+                        else if (!strcmp(optarg, "CBUFF"))
+                                vars_to_check = CBUFF;
+                        else if (!strcmp(optarg, "CDBUFF"))
+                                vars_to_check = CDBUFF;
+                        else if (!strcmp(optarg, "LRUM"))
+                                vars_to_check = LRUM;
+                        else if (!strcmp(optarg, "LRUS"))
+                                vars_to_check = LRUS;
+                        else if (strncmp(optarg, "VPF", 3) == 0) {
+                                vars_to_check = VPF;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VKF", 3) == 0) {
+                                vars_to_check = VKF;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VMF", 3) == 0) {
+                                vars_to_check = VMF;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (!strcmp(optarg, "DSDB"))
+                                vars_to_check = DSDB;
+                        else if (!strcmp(optarg, "LOGINS"))
+                                vars_to_check = LOGINS;
+                        else if (!strcmp(optarg, "NRMH"))
+                                vars_to_check = NRMH;
+                        else if (!strcmp(optarg, "UPRB"))
+                                vars_to_check = UPRB;
+                        else if (!strcmp(optarg, "PUPRB"))
+                                vars_to_check = PUPRB;
+                        else if (!strncmp(optarg, "SAPENTRIES", 10)) {
+                                vars_to_check = SAPENTRIES;
+                                if (strlen(optarg) > 10)
+                                        sap_number = atoi(optarg + 10);
                                 else
-                                        die(STATE_UNKNOWN,_("Server port an integer\n"));
-                                break;
-                        case 'v':
-                                if (strlen(optarg)<3)
-                                        return ERROR;
-                                if (!strcmp(optarg,"LOAD1"))
-                                        vars_to_check=LOAD1;
-                                else if (!strcmp(optarg,"LOAD5"))
-                                        vars_to_check=LOAD5;
-                                else if (!strcmp(optarg,"LOAD15"))
-                                        vars_to_check=LOAD15;
-                                else if (!strcmp(optarg,"CONNS"))
-                                        vars_to_check=CONNS;
-                                else if (!strcmp(optarg,"LTCH"))
-                                        vars_to_check=LTCH;
-                                else if (!strcmp(optarg,"DCB"))
-                                        vars_to_check=DCB;
-                                else if (!strcmp(optarg,"TCB"))
-                                        vars_to_check=TCB;
-                                else if (!strcmp(optarg,"CBUFF"))
-                                        vars_to_check=CBUFF;
-                                else if (!strcmp(optarg,"CDBUFF"))
-                                        vars_to_check=CDBUFF;
-                                else if (!strcmp(optarg,"LRUM"))
-                                        vars_to_check=LRUM;
-                                else if (!strcmp(optarg,"LRUS"))
-                                        vars_to_check=LRUS;
-                                else if (strncmp(optarg,"VPF",3)==0) {
-                                        vars_to_check=VPF;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VKF",3)==0) {
-                                        vars_to_check=VKF;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VMF",3)==0) {
-                                        vars_to_check=VMF;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (!strcmp(optarg,"DSDB"))
-                                        vars_to_check=DSDB;
-                                else if (!strcmp(optarg,"LOGINS"))
-                                        vars_to_check=LOGINS;
-                                else if (!strcmp(optarg,"NRMH"))
-                                        vars_to_check=NRMH;
-                                else if (!strcmp(optarg,"UPRB"))
-                                        vars_to_check=UPRB;
-                                else if (!strcmp(optarg,"PUPRB"))
-                                        vars_to_check=PUPRB;
-                                else if (!strncmp(optarg,"SAPENTRIES",10)) {
-                                        vars_to_check=SAPENTRIES;
-                                        if (strlen(optarg)>10)
-                                                sap_number=atoi(optarg+10);
-                                        else
-                                                sap_number=-1;
-                                }
-                                else if (!strcmp(optarg,"OFILES"))
-                                        vars_to_check=OFILES;
-                                else if (strncmp(optarg,"VKP",3)==0) {
-                                        vars_to_check=VKP;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VMP",3)==0) {
-                                        vars_to_check=VMP;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VMU",3)==0) {
-                                        vars_to_check=VMU;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VPU",3)==0) {
-                                        vars_to_check=VPU;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VPP",3)==0) {
-                                        vars_to_check=VPP;
-                                        volume_name = strdup (optarg+3);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VKNP",4)==0) {
-                                        vars_to_check=VKNP;
-                                        volume_name = strdup (optarg+4);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup ("SYS");
-                                }
-                                else if (strncmp(optarg,"VPNP",4)==0) {
-                                        vars_to_check=VPNP;
-                                        volume_name = strdup (optarg+4);
-                                        if (!strcmp(volume_name,""))
-                                                volume_name = strdup("SYS");
-                                }
-                                else if (!strcmp(optarg,"ABENDS"))
-                                        vars_to_check=ABENDS;
-                                else if (!strcmp(optarg,"CSPROCS"))
-                                        vars_to_check=CSPROCS;
-                                else if (!strcmp(optarg,"TSYNC"))
-                                        vars_to_check=TSYNC;
-                                else if (!strcmp(optarg,"DSVER"))
-                                        vars_to_check=DSVER;
-                                else if (!strcmp(optarg,"UPTIME")) {
-                                        vars_to_check=UPTIME;
-                                }
-                                else if (strncmp(optarg,"NLM:",4)==0) {
-                                        vars_to_check=NLM;
-                                        nlm_name=strdup (optarg+4);
-                                }
-                                else if (strncmp(optarg,"NRMP",4)==0) {
-                                        vars_to_check=NRMP;
-                                        nrmp_name = strdup (optarg+4);
-                                        if (!strcmp(nrmp_name,""))
-                                                nrmp_name = strdup ("AVAILABLE_MEMORY");
-                                }
-                                else if (strncmp(optarg,"NRMM",4)==0) {
-                                        vars_to_check=NRMM;
-                                        nrmm_name = strdup (optarg+4);
-                                        if (!strcmp(nrmm_name,""))
-                                                nrmm_name = strdup ("AVAILABLE_CACHE_MEMORY");
-
-                                }
-
-                                else if (strncmp(optarg,"NRMS",4)==0) {
-                                        vars_to_check=NRMS;
-                                        nrms_name = strdup (optarg+4);
-                                        if (!strcmp(nrms_name,""))
-                                                nrms_name = strdup ("USED_SWAP_SPACE");
-
-                                }
-
-                                else if (strncmp(optarg,"NSS1",4)==0) {
-                                        vars_to_check=NSS1;
-                                        nss1_name = strdup (optarg+4);
-                                        if (!strcmp(nss1_name,""))
-                                                nss1_name = strdup ("CURRENTBUFFERCACHESIZE");
-
-                                }
-
-                                else if (strncmp(optarg,"NSS2",4)==0) {
-                                        vars_to_check=NSS2;
-                                        nss2_name = strdup (optarg+4);
-                                        if (!strcmp(nss2_name,""))
-                                                nss2_name = strdup ("CACHEHITS");
-
-                                }
-
-                                else if (strncmp(optarg,"NSS3",4)==0) {
-                                        vars_to_check=NSS3;
-                                        nss3_name = strdup (optarg+4);
-                                        if (!strcmp(nss3_name,""))
-                                                nss3_name = strdup ("CACHEGITPERCENT");
-
-                                }
-
-                                else if (strncmp(optarg,"NSS4",4)==0) {
-                                        vars_to_check=NSS4;
-                                        nss4_name = strdup (optarg+4);
-                                        if (!strcmp(nss4_name,""))
-                                                nss4_name = strdup ("CURRENTOPENCOUNT");
-
-                                }
-
-                                else if (strncmp(optarg,"NSS5",4)==0) {
-                                        vars_to_check=NSS5;
-                                        nss5_name = strdup (optarg+4);
-                                        if (!strcmp(nss5_name,""))
-                                                nss5_name = strdup ("CACHEMISSES");
-
-                                }
-
-
-                                else if (strncmp(optarg,"NSS6",4)==0) {
-                                        vars_to_check=NSS6;
-                                        nss6_name = strdup (optarg+4);
-                                        if (!strcmp(nss6_name,""))
-                                                nss6_name = strdup ("PENDINGWORKSCOUNT");
-
-                                }
-
-
-                                else if (strncmp(optarg,"NSS7",4)==0) {
-                                        vars_to_check=NSS7;
-                                        nss7_name = strdup (optarg+4);
-                                        if (!strcmp(nss7_name,""))
-                                                nss7_name = strdup ("CACHESIZE");
-
-                                }
+                                        sap_number = -1;
+                        } else if (!strcmp(optarg, "OFILES"))
+                                vars_to_check = OFILES;
+                        else if (strncmp(optarg, "VKP", 3) == 0) {
+                                vars_to_check = VKP;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VMP", 3) == 0) {
+                                vars_to_check = VMP;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VMU", 3) == 0) {
+                                vars_to_check = VMU;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VPU", 3) == 0) {
+                                vars_to_check = VPU;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VPP", 3) == 0) {
+                                vars_to_check = VPP;
+                                volume_name = strdup(optarg + 3);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VKNP", 4) == 0) {
+                                vars_to_check = VKNP;
+                                volume_name = strdup(optarg + 4);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (strncmp(optarg, "VPNP", 4) == 0) {
+                                vars_to_check = VPNP;
+                                volume_name = strdup(optarg + 4);
+                                if (!strcmp(volume_name, ""))
+                                        volume_name = strdup("SYS");
+                        } else if (!strcmp(optarg, "ABENDS"))
+                                vars_to_check = ABENDS;
+                        else if (!strcmp(optarg, "CSPROCS"))
+                                vars_to_check = CSPROCS;
+                        else if (!strcmp(optarg, "TSYNC"))
+                                vars_to_check = TSYNC;
+                        else if (!strcmp(optarg, "DSVER"))
+                                vars_to_check = DSVER;
+                        else if (!strcmp(optarg, "UPTIME")) {
+                                vars_to_check = UPTIME;
+                        } else if (strncmp(optarg, "NLM:", 4) == 0) {
+                                vars_to_check = NLM;
+                                nlm_name = strdup(optarg + 4);
+                        } else if (strncmp(optarg, "NRMP", 4) == 0) {
+                                vars_to_check = NRMP;
+                                nrmp_name = strdup(optarg + 4);
+                                if (!strcmp(nrmp_name, ""))
+                                        nrmp_name = strdup("AVAILABLE_MEMORY");
+                        } else if (strncmp(optarg, "NRMM", 4) == 0) {
+                                vars_to_check = NRMM;
+                                nrmm_name = strdup(optarg + 4);
+                                if (!strcmp(nrmm_name, ""))
+                                        nrmm_name = strdup("AVAILABLE_CACHE_MEMORY");
 
+                        }
+
+                        else if (strncmp(optarg, "NRMS", 4) == 0) {
+                                vars_to_check = NRMS;
+                                nrms_name = strdup(optarg + 4);
+                                if (!strcmp(nrms_name, ""))
+                                        nrms_name = strdup("USED_SWAP_SPACE");
 
-                                else
-                                        return ERROR;
-                                break;
-                        case 'w': /* warning threshold */
-                                warning_value=strtoul(optarg,NULL,10);
-                                check_warning_value = true;
-                                break;
-                        case 'c': /* critical threshold */
-                                critical_value=strtoul(optarg,NULL,10);
-                                check_critical_value = true;
-                                break;
-                        case 't': /* timeout */
-                                socket_timeout=atoi(optarg);
-                                if (socket_timeout<=0)
-                                        return ERROR;
                         }
 
+                        else if (strncmp(optarg, "NSS1", 4) == 0) {
+                                vars_to_check = NSS1;
+                                nss1_name = strdup(optarg + 4);
+                                if (!strcmp(nss1_name, ""))
+                                        nss1_name = strdup("CURRENTBUFFERCACHESIZE");
+
+                        }
+
+                        else if (strncmp(optarg, "NSS2", 4) == 0) {
+                                vars_to_check = NSS2;
+                                nss2_name = strdup(optarg + 4);
+                                if (!strcmp(nss2_name, ""))
+                                        nss2_name = strdup("CACHEHITS");
+
+                        }
+
+                        else if (strncmp(optarg, "NSS3", 4) == 0) {
+                                vars_to_check = NSS3;
+                                nss3_name = strdup(optarg + 4);
+                                if (!strcmp(nss3_name, ""))
+                                        nss3_name = strdup("CACHEGITPERCENT");
+
+                        }
+
+                        else if (strncmp(optarg, "NSS4", 4) == 0) {
+                                vars_to_check = NSS4;
+                                nss4_name = strdup(optarg + 4);
+                                if (!strcmp(nss4_name, ""))
+                                        nss4_name = strdup("CURRENTOPENCOUNT");
+
+                        }
+
+                        else if (strncmp(optarg, "NSS5", 4) == 0) {
+                                vars_to_check = NSS5;
+                                nss5_name = strdup(optarg + 4);
+                                if (!strcmp(nss5_name, ""))
+                                        nss5_name = strdup("CACHEMISSES");
+
+                        }
+
+                        else if (strncmp(optarg, "NSS6", 4) == 0) {
+                                vars_to_check = NSS6;
+                                nss6_name = strdup(optarg + 4);
+                                if (!strcmp(nss6_name, ""))
+                                        nss6_name = strdup("PENDINGWORKSCOUNT");
+
+                        }
+
+                        else if (strncmp(optarg, "NSS7", 4) == 0) {
+                                vars_to_check = NSS7;
+                                nss7_name = strdup(optarg + 4);
+                                if (!strcmp(nss7_name, ""))
+                                        nss7_name = strdup("CACHESIZE");
+
+                        }
+
+                        else
+                                return ERROR;
+                        break;
+                case 'w': /* warning threshold */
+                        warning_value = strtoul(optarg, NULL, 10);
+                        check_warning_value = true;
+                        break;
+                case 'c': /* critical threshold */
+                        critical_value = strtoul(optarg, NULL, 10);
+                        check_critical_value = true;
+                        break;
+                case 't': /* timeout */
+                        socket_timeout = atoi(optarg);
+                        if (socket_timeout <= 0)
+                                return ERROR;
+                }
         }
 
         return OK;
 }
 
-
-
-void print_help(void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", PORT);
+        xasprintf(&myport, "%d", PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin attempts to contact the MRTGEXT NLM running on a"));
-  printf ("%s\n", _("Novell server to gather the requested system information."));
+        printf("%s\n", _("This plugin attempts to contact the MRTGEXT NLM running on a"));
+        printf("%s\n", _("Novell server to gather the requested system information."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_HOST_PORT, 'p', myport);
-
-        printf (" %s\n", "-v, --variable=STRING");
-  printf ("   %s\n", _("Variable to check.  Valid variables include:"));
-  printf ("    %s\n", _("LOAD1     = 1 minute average CPU load"));
-  printf ("    %s\n", _("LOAD5     = 5 minute average CPU load"));
-  printf ("    %s\n", _("LOAD15    = 15 minute average CPU load"));
-  printf ("    %s\n", _("CSPROCS   = number of current service processes (NW 5.x only)"));
-  printf ("    %s\n", _("ABENDS    = number of abended threads (NW 5.x only)"));
-  printf ("    %s\n", _("UPTIME    = server uptime"));
-        printf ("    %s\n", _("LTCH      = percent long term cache hits"));
-  printf ("    %s\n", _("CBUFF     = current number of cache buffers"));
-  printf ("    %s\n", _("CDBUFF    = current number of dirty cache buffers"));
-  printf ("    %s\n", _("DCB       = dirty cache buffers as a percentage of the total"));
-  printf ("    %s\n", _("TCB       = dirty cache buffers as a percentage of the original"));
-        printf ("    %s\n", _("OFILES    = number of open files"));
-  printf ("    %s\n", _("    VMF<vol>  = MB of free space on Volume <vol>"));
-  printf ("    %s\n", _("    VMU<vol>  = MB used space on Volume <vol>"));
-  printf ("    %s\n", _("    VPU<vol>  = percent used space on Volume <vol>"));
-  printf ("    %s\n", _("    VMP<vol>  = MB of purgeable space on Volume <vol>"));
-  printf ("    %s\n", _("    VPF<vol>  = percent free space on volume <vol>"));
-  printf ("    %s\n", _("    VKF<vol>  = KB of free space on volume <vol>"));
-  printf ("    %s\n", _("    VPP<vol>  = percent purgeable space on volume <vol>"));
-  printf ("    %s\n", _("    VKP<vol>  = KB of purgeable space on volume <vol>"));
-  printf ("    %s\n", _("    VPNP<vol> = percent not yet purgeable space on volume <vol>"));
-  printf ("    %s\n", _("    VKNP<vol> = KB of not yet purgeable space on volume <vol>"));
-  printf ("    %s\n", _("    LRUM      = LRU sitting time in minutes"));
-  printf ("    %s\n", _("    LRUS      = LRU sitting time in seconds"));
-  printf ("    %s\n", _("    DSDB      = check to see if DS Database is open"));
-  printf ("    %s\n", _("    DSVER     = NDS version"));
-  printf ("    %s\n", _("    UPRB      = used packet receive buffers"));
-  printf ("    %s\n", _("    PUPRB     = percent (of max) used packet receive buffers"));
-  printf ("    %s\n", _("    SAPENTRIES = number of entries in the SAP table"));
-  printf ("    %s\n", _("    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"));
-  printf ("    %s\n", _("    TSYNC     = timesync status"));
-  printf ("    %s\n", _("    LOGINS    = check to see if logins are enabled"));
-  printf ("    %s\n", _("    CONNS     = number of currently licensed connections"));
-  printf ("    %s\n", _("    NRMH       = NRM Summary Status"));
-  printf ("    %s\n", _("    NRMP<stat> = Returns the current value for a NRM health item"));
-  printf ("    %s\n", _("    NRMM<stat> = Returns the current memory stats from NRM"));
-  printf ("    %s\n", _("    NRMS<stat> = Returns the current Swapfile stats from NRM"));
-  printf ("    %s\n", _("    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"));
-  printf ("    %s\n", _("    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"));
-  printf ("    %s\n", _("    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"));
-  printf ("    %s\n", _("    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"));
-  printf ("    %s\n", _("    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"));
-  printf ("    %s\n", _("    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"));
-  printf ("    %s\n", _("    NLM:<nlm> = check if NLM is loaded and report version"));
-  printf ("    %s\n", _("                (e.g. NLM:TSANDS.NLM)"));
-  printf ("\n");
-        printf (" %s\n", "-w, --warning=INTEGER");
-  printf ("    %s\n", _("Threshold which will result in a warning status"));
-  printf (" %s\n", "-c, --critical=INTEGER");
-  printf ("    %s\n", _("Threshold which will result in a critical status"));
-  printf (" %s\n", "-o, --osversion");
-  printf ("    %s\n", _("Include server version string in results"));
-
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"));
-  printf (" %s\n", _("  extension for NetWare be loaded on the Novell servers you wish to check."));
-  printf (" %s\n", _("  (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
-  printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
-  printf (" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
-  printf (" %s\n", _("  TCB, LRUS and LRUM."));
-
-        printf (UT_SUPPORT);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'p', myport);
+
+        printf(" %s\n", "-v, --variable=STRING");
+        printf("   %s\n", _("Variable to check.  Valid variables include:"));
+        printf("    %s\n", _("LOAD1     = 1 minute average CPU load"));
+        printf("    %s\n", _("LOAD5     = 5 minute average CPU load"));
+        printf("    %s\n", _("LOAD15    = 15 minute average CPU load"));
+        printf("    %s\n", _("CSPROCS   = number of current service processes (NW 5.x only)"));
+        printf("    %s\n", _("ABENDS    = number of abended threads (NW 5.x only)"));
+        printf("    %s\n", _("UPTIME    = server uptime"));
+        printf("    %s\n", _("LTCH      = percent long term cache hits"));
+        printf("    %s\n", _("CBUFF     = current number of cache buffers"));
+        printf("    %s\n", _("CDBUFF    = current number of dirty cache buffers"));
+        printf("    %s\n", _("DCB       = dirty cache buffers as a percentage of the total"));
+        printf("    %s\n", _("TCB       = dirty cache buffers as a percentage of the original"));
+        printf("    %s\n", _("OFILES    = number of open files"));
+        printf("    %s\n", _("    VMF<vol>  = MB of free space on Volume <vol>"));
+        printf("    %s\n", _("    VMU<vol>  = MB used space on Volume <vol>"));
+        printf("    %s\n", _("    VPU<vol>  = percent used space on Volume <vol>"));
+        printf("    %s\n", _("    VMP<vol>  = MB of purgeable space on Volume <vol>"));
+        printf("    %s\n", _("    VPF<vol>  = percent free space on volume <vol>"));
+        printf("    %s\n", _("    VKF<vol>  = KB of free space on volume <vol>"));
+        printf("    %s\n", _("    VPP<vol>  = percent purgeable space on volume <vol>"));
+        printf("    %s\n", _("    VKP<vol>  = KB of purgeable space on volume <vol>"));
+        printf("    %s\n", _("    VPNP<vol> = percent not yet purgeable space on volume <vol>"));
+        printf("    %s\n", _("    VKNP<vol> = KB of not yet purgeable space on volume <vol>"));
+        printf("    %s\n", _("    LRUM      = LRU sitting time in minutes"));
+        printf("    %s\n", _("    LRUS      = LRU sitting time in seconds"));
+        printf("    %s\n", _("    DSDB      = check to see if DS Database is open"));
+        printf("    %s\n", _("    DSVER     = NDS version"));
+        printf("    %s\n", _("    UPRB      = used packet receive buffers"));
+        printf("    %s\n", _("    PUPRB     = percent (of max) used packet receive buffers"));
+        printf("    %s\n", _("    SAPENTRIES = number of entries in the SAP table"));
+        printf("    %s\n", _("    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"));
+        printf("    %s\n", _("    TSYNC     = timesync status"));
+        printf("    %s\n", _("    LOGINS    = check to see if logins are enabled"));
+        printf("    %s\n", _("    CONNS     = number of currently licensed connections"));
+        printf("    %s\n", _("    NRMH  = NRM Summary Status"));
+        printf("    %s\n", _("    NRMP<stat> = Returns the current value for a NRM health item"));
+        printf("    %s\n", _("    NRMM<stat> = Returns the current memory stats from NRM"));
+        printf("    %s\n", _("    NRMS<stat> = Returns the current Swapfile stats from NRM"));
+        printf("    %s\n", _("    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"));
+        printf("    %s\n", _("    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"));
+        printf("    %s\n", _("    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"));
+        printf("    %s\n", _("    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"));
+        printf("    %s\n", _("    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"));
+        printf("    %s\n", _("    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"));
+        printf("    %s\n", _("    NLM:<nlm> = check if NLM is loaded and report version"));
+        printf("    %s\n", _("                (e.g. NLM:TSANDS.NLM)"));
+        printf("\n");
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("    %s\n", _("Threshold which will result in a warning status"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("    %s\n", _("Threshold which will result in a critical status"));
+        printf(" %s\n", "-o, --osversion");
+        printf("    %s\n", _("Include server version string in results"));
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"));
+        printf(" %s\n", _("  extension for NetWare be loaded on the Novell servers you wish to check."));
+        printf(" %s\n", _("  (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
+        printf(" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
+        printf(" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
+        printf(" %s\n", _("  TCB, LRUS and LRUM."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void print_usage(void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n",progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n", progname);
 }
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 5165c82..e80d477 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_overcr plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_overcr plugin
-* 
-* This plugin attempts to contact the Over-CR collector daemon running on the
-* remote UNIX server in order to gather the requested system information.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_overcr plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_overcr plugin
+ *
+ * This plugin attempts to contact the Over-CR collector daemon running on the
+ * remote UNIX server in order to gather the requested system information.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_overcr";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -66,13 +66,11 @@ char *disk_name = NULL;
 char *process_name = NULL;
 char send_buffer[MAX_INPUT_BUFFER];
 
-int process_arguments (int, char **);
-void print_usage (void);
-void print_help (void);
+int process_arguments(int, char **);
+void print_usage(void);
+void print_help(void);
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int result = STATE_UNKNOWN;
         char recv_buffer[MAX_INPUT_BUFFER];
         char temp_buffer[MAX_INPUT_BUFFER];
@@ -91,66 +89,62 @@ main (int argc, char **argv)
         int uptime_hours = 0;
         int uptime_minutes = 0;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
 
-        result = process_tcp_request2 (server_address,
-                                       server_port,
-                                       send_buffer,
-                                       recv_buffer,
-                                       sizeof (recv_buffer));
+        result = process_tcp_request2(server_address, server_port, send_buffer, recv_buffer, sizeof(recv_buffer));
 
         switch (vars_to_check) {
 
         case LOAD1:
         case LOAD5:
         case LOAD15:
-        
+
                 if (result != STATE_OK)
-                        die (result, _("Unknown error fetching load data\n"));
+                        die(result, _("Unknown error fetching load data\n"));
 
-                temp_ptr = (char *) strtok (recv_buffer, "\r\n");
+                temp_ptr = (char *)strtok(recv_buffer, "\r\n");
                 if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server - no load information\n"));
+                        die(STATE_CRITICAL, _("Invalid response from server - no load information\n"));
                 else
-                        load_1min = strtod (temp_ptr, NULL);
+                        load_1min = strtod(temp_ptr, NULL);
 
-                temp_ptr = (char *) strtok (NULL, "\r\n");
+                temp_ptr = (char *)strtok(NULL, "\r\n");
                 if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server after load 1\n"));
+                        die(STATE_CRITICAL, _("Invalid response from server after load 1\n"));
                 else
-                        load_5min = strtod (temp_ptr, NULL);
+                        load_5min = strtod(temp_ptr, NULL);
 
-                temp_ptr = (char *) strtok (NULL, "\r\n");
+                temp_ptr = (char *)strtok(NULL, "\r\n");
                 if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server after load 5\n"));
+                        die(STATE_CRITICAL, _("Invalid response from server after load 5\n"));
                 else
-                        load_15min = strtod (temp_ptr, NULL);
+                        load_15min = strtod(temp_ptr, NULL);
 
                 switch (vars_to_check) {
                 case LOAD1:
-                        strcpy (temp_buffer, "1");
+                        strcpy(temp_buffer, "1");
                         load = load_1min;
                         break;
                 case LOAD5:
-                        strcpy (temp_buffer, "5");
+                        strcpy(temp_buffer, "5");
                         load = load_5min;
                         break;
                 default:
-                        strcpy (temp_buffer, "15");
+                        strcpy(temp_buffer, "15");
                         load = load_15min;
                         break;
                 }
@@ -160,98 +154,82 @@ main (int argc, char **argv)
                 else if (check_warning_value && (load >= warning_value))
                         result = STATE_WARNING;
 
-                die (result,
-                          _("Load %s - %s-min load average = %0.2f"),
-                                                         state_text(result),
-                          temp_buffer,
-                          load);
+                die(result, _("Load %s - %s-min load average = %0.2f"), state_text(result), temp_buffer, load);
 
-                        break;
+                break;
 
         case DPU:
 
                 if (result != STATE_OK)
-                        die (result, _("Unknown error fetching disk data\n"));
+                        die(result, _("Unknown error fetching disk data\n"));
 
-                for (temp_ptr = (char *) strtok (recv_buffer, " ");
-                     temp_ptr != NULL;
-                     temp_ptr = (char *) strtok (NULL, " ")) {
+                for (temp_ptr = (char *)strtok(recv_buffer, " "); temp_ptr != NULL; temp_ptr = (char *)strtok(NULL, " ")) {
 
-                        if (!strcmp (temp_ptr, disk_name)) {
+                        if (!strcmp(temp_ptr, disk_name)) {
                                 found_disk = true;
-                                temp_ptr = (char *) strtok (NULL, "%");
+                                temp_ptr = (char *)strtok(NULL, "%");
                                 if (temp_ptr == NULL)
-                                        die (STATE_CRITICAL, _("Invalid response from server\n"));
+                                        die(STATE_CRITICAL, _("Invalid response from server\n"));
                                 else
-                                        percent_used_disk_space = strtoul (temp_ptr, NULL, 10);
+                                        percent_used_disk_space = strtoul(temp_ptr, NULL, 10);
                                 break;
                         }
 
-                        temp_ptr = (char *) strtok (NULL, "\r\n");
+                        temp_ptr = (char *)strtok(NULL, "\r\n");
                 }
 
                 /* error if we couldn't find the info for the disk */
                 if (!found_disk)
-                        die (STATE_CRITICAL,
-                                   "CRITICAL - Disk '%s' non-existent or not mounted",
-                                   disk_name);
+                        die(STATE_CRITICAL, "CRITICAL - Disk '%s' non-existent or not mounted", disk_name);
 
                 if (check_critical_value && (percent_used_disk_space >= critical_value))
                         result = STATE_CRITICAL;
                 else if (check_warning_value && (percent_used_disk_space >= warning_value))
                         result = STATE_WARNING;
 
-                die (result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name);
+                die(result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name);
 
                 break;
 
         case NETSTAT:
 
                 if (result != STATE_OK)
-                        die (result, _("Unknown error fetching network status\n"));
+                        die(result, _("Unknown error fetching network status\n"));
                 else
-                        port_connections = strtod (recv_buffer, NULL);
+                        port_connections = strtod(recv_buffer, NULL);
 
                 if (check_critical_value && (port_connections >= critical_value))
                         result = STATE_CRITICAL;
                 else if (check_warning_value && (port_connections >= warning_value))
                         result = STATE_WARNING;
 
-                die (result,
-                           _("Net %s - %d connection%s on port %d"),
-                           state_text(result),
-                           port_connections,
-                           (port_connections == 1) ? "" : "s",
-                           netstat_port);
+                die(result, _("Net %s - %d connection%s on port %d"), state_text(result), port_connections, (port_connections == 1) ? "" : "s",
+                        netstat_port);
 
                 break;
 
         case PROCS:
 
                 if (result != STATE_OK)
-                        die (result, _("Unknown error fetching process status\n"));
+                        die(result, _("Unknown error fetching process status\n"));
 
-                temp_ptr = (char *) strtok (recv_buffer, "(");
+                temp_ptr = (char *)strtok(recv_buffer, "(");
                 if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server\n"));
+                        die(STATE_CRITICAL, _("Invalid response from server\n"));
 
-                temp_ptr = (char *) strtok (NULL, ")");
+                temp_ptr = (char *)strtok(NULL, ")");
                 if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server\n"));
+                        die(STATE_CRITICAL, _("Invalid response from server\n"));
                 else
-                        processes = strtod (temp_ptr, NULL);
+                        processes = strtod(temp_ptr, NULL);
 
                 if (check_critical_value && (processes >= critical_value))
                         result = STATE_CRITICAL;
                 else if (check_warning_value && (processes >= warning_value))
                         result = STATE_WARNING;
 
-                die (result,
-                           _("Process %s - %d instance%s of %s running"),
-                           state_text(result),
-                           processes,
-                           (processes == 1) ? "" : "s",
-                           process_name);
+                die(result, _("Process %s - %d instance%s of %s running"), state_text(result), processes, (processes == 1) ? "" : "s",
+                        process_name);
                 break;
 
         case UPTIME:
@@ -259,8 +237,8 @@ main (int argc, char **argv)
                 if (result != STATE_OK)
                         return result;
 
-                uptime_raw_hours = strtod (recv_buffer, NULL);
-                uptime_raw_minutes = (unsigned long) (uptime_raw_hours * 60.0);
+                uptime_raw_hours = strtod(recv_buffer, NULL);
+                uptime_raw_minutes = (unsigned long)(uptime_raw_hours * 60.0);
 
                 if (check_critical_value && (uptime_raw_minutes <= critical_value))
                         result = STATE_CRITICAL;
@@ -273,46 +251,31 @@ main (int argc, char **argv)
                 uptime_raw_minutes %= 60;
                 uptime_minutes = uptime_raw_minutes;
 
-                die (result,
-                           _("Uptime %s - Up %d days %d hours %d minutes"),
-                           state_text(result),
-                           uptime_days,
-                           uptime_hours,
-                           uptime_minutes);
+                die(result, _("Uptime %s - Up %d days %d hours %d minutes"), state_text(result), uptime_days, uptime_hours, uptime_minutes);
                 break;
 
         default:
-                die (STATE_UNKNOWN, _("Nothing to check!\n"));
+                die(STATE_UNKNOWN, _("Nothing to check!\n"));
                 break;
         }
 }
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
         int c;
 
         int option = 0;
         static struct option longopts[] = {
-                {"port", required_argument, 0, 'p'},
-                {"timeout", required_argument, 0, 't'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"variable", required_argument, 0, 'v'},
-                {"hostname", required_argument, 0, 'H'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+                {"port", required_argument, 0, 'p'},    {"timeout", required_argument, 0, 't'},  {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'}, {"variable", required_argument, 0, 'v'}, {"hostname", required_argument, 0, 'H'},
+                {"version", no_argument, 0, 'V'},       {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
 
         /* no options were supplied */
         if (argc < 2)
                 return ERROR;
 
         /* backwards compatibility */
-        if (!is_option (argv[1])) {
+        if (!is_option(argv[1])) {
                 server_address = argv[1];
                 argv[1] = argv[0];
                 argv = &argv[1];
@@ -320,150 +283,136 @@ process_arguments (int argc, char **argv)
         }
 
         for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wv", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-cv", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+                else if (strcmp("-wv", argv[c]) == 0)
+                        strcpy(argv[c], "-w");
+                else if (strcmp("-cv", argv[c]) == 0)
+                        strcpy(argv[c], "-c");
         }
 
         while (1) {
-                c = getopt_long (argc, argv, "+hVH:t:c:w:p:v:", longopts,
-                                                                         &option);
+                c = getopt_long(argc, argv, "+hVH:t:c:w:p:v:", longopts, &option);
 
                 if (c == -1 || c == EOF || c == 1)
                         break;
 
                 switch (c) {
-                case '?':                                                                       /* print short usage statement if args not parsable */
-                        usage5 ();
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'H':                                                                       /* hostname */
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'H': /* hostname */
                         server_address = optarg;
                         break;
-                case 'p':                                                                       /* port */
-                        if (is_intnonneg (optarg))
-                                server_port = atoi (optarg);
+                case 'p': /* port */
+                        if (is_intnonneg(optarg))
+                                server_port = atoi(optarg);
                         else
-                                die (STATE_UNKNOWN,
-                                                                         _("Server port an integer\n"));
+                                die(STATE_UNKNOWN, _("Server port an integer\n"));
                         break;
-                case 'v':                                                                       /* variable */
-                        if (strcmp (optarg, "LOAD") == 0) {
-                                strcpy (send_buffer, "LOAD\r\nQUIT\r\n");
-                                if (strcmp (optarg, "LOAD1") == 0)
+                case 'v': /* variable */
+                        if (strcmp(optarg, "LOAD") == 0) {
+                                strcpy(send_buffer, "LOAD\r\nQUIT\r\n");
+                                if (strcmp(optarg, "LOAD1") == 0)
                                         vars_to_check = LOAD1;
-                                else if (strcmp (optarg, "LOAD5") == 0)
+                                else if (strcmp(optarg, "LOAD5") == 0)
                                         vars_to_check = LOAD5;
-                                else if (strcmp (optarg, "LOAD15") == 0)
+                                else if (strcmp(optarg, "LOAD15") == 0)
                                         vars_to_check = LOAD15;
-                        }
-                        else if (strcmp (optarg, "UPTIME") == 0) {
+                        } else if (strcmp(optarg, "UPTIME") == 0) {
                                 vars_to_check = UPTIME;
-                                strcpy (send_buffer, "UPTIME\r\n");
-                        }
-                        else if (strstr (optarg, "PROC") == optarg) {
+                                strcpy(send_buffer, "UPTIME\r\n");
+                        } else if (strstr(optarg, "PROC") == optarg) {
                                 vars_to_check = PROCS;
-                                process_name = strscpy (process_name, optarg + 4);
-                                sprintf (send_buffer, "PROCESS %s\r\n", process_name);
-                        }
-                        else if (strstr (optarg, "NET") == optarg) {
+                                process_name = strscpy(process_name, optarg + 4);
+                                sprintf(send_buffer, "PROCESS %s\r\n", process_name);
+                        } else if (strstr(optarg, "NET") == optarg) {
                                 vars_to_check = NETSTAT;
-                                netstat_port = atoi (optarg + 3);
-                                sprintf (send_buffer, "NETSTAT %d\r\n", netstat_port);
-                        }
-                        else if (strstr (optarg, "DPU") == optarg) {
+                                netstat_port = atoi(optarg + 3);
+                                sprintf(send_buffer, "NETSTAT %d\r\n", netstat_port);
+                        } else if (strstr(optarg, "DPU") == optarg) {
                                 vars_to_check = DPU;
-                                strcpy (send_buffer, "DISKSPACE\r\n");
-                                disk_name = strscpy (disk_name, optarg + 3);
-                        }
-                        else
+                                strcpy(send_buffer, "DISKSPACE\r\n");
+                                disk_name = strscpy(disk_name, optarg + 3);
+                        } else
                                 return ERROR;
                         break;
-                case 'w':                                                                       /* warning threshold */
-                        warning_value = strtoul (optarg, NULL, 10);
+                case 'w': /* warning threshold */
+                        warning_value = strtoul(optarg, NULL, 10);
                         check_warning_value = true;
                         break;
-                case 'c':                                                                       /* critical threshold */
-                        critical_value = strtoul (optarg, NULL, 10);
+                case 'c': /* critical threshold */
+                        critical_value = strtoul(optarg, NULL, 10);
                         check_critical_value = true;
                         break;
-                case 't':                                                                       /* timeout */
-                        socket_timeout = atoi (optarg);
+                case 't': /* timeout */
+                        socket_timeout = atoi(optarg);
                         if (socket_timeout <= 0)
                                 return ERROR;
                 }
-
         }
         return OK;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", PORT);
+        xasprintf(&myport, "%d", PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin attempts to contact the Over-CR collector daemon running on the"));
-  printf ("%s\n", _("remote UNIX server in order to gather the requested system information."));
+        printf("%s\n", _("This plugin attempts to contact the Over-CR collector daemon running on the"));
+        printf("%s\n", _("remote UNIX server in order to gather the requested system information."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-  printf (" %s\n", "-w, --warning=INTEGER");
-  printf ("    %s\n", _("Threshold which will result in a warning status"));
-  printf (" %s\n", "-c, --critical=INTEGER");
-  printf ("    %s\n", _("Threshold which will result in a critical status"));
-  printf (" %s\n", "-v, --variable=STRING");
-  printf ("    %s\n", _("Variable to check.  Valid variables include:"));
-  printf ("    %s\n", _("LOAD1         = 1 minute average CPU load"));
-  printf ("    %s\n", _("LOAD5         = 5 minute average CPU load"));
-  printf ("    %s\n", _("LOAD15        = 15 minute average CPU load"));
-  printf ("    %s\n", _("DPU<filesys>  = percent used disk space on filesystem <filesys>"));
-  printf ("    %s\n", _("PROC<process> = number of running processes with name <process>"));
-  printf ("    %s\n", _("NET<port>     = number of active connections on TCP port <port>"));
-  printf ("    %s\n", _("UPTIME        = system uptime in seconds"));
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("    %s\n", _("Threshold which will result in a warning status"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("    %s\n", _("Threshold which will result in a critical status"));
+        printf(" %s\n", "-v, --variable=STRING");
+        printf("    %s\n", _("Variable to check.  Valid variables include:"));
+        printf("    %s\n", _("LOAD1         = 1 minute average CPU load"));
+        printf("    %s\n", _("LOAD5         = 5 minute average CPU load"));
+        printf("    %s\n", _("LOAD15        = 15 minute average CPU load"));
+        printf("    %s\n", _("DPU<filesys>  = percent used disk space on filesystem <filesys>"));
+        printf("    %s\n", _("PROC<process> = number of running processes with name <process>"));
+        printf("    %s\n", _("NET<port>     = number of active connections on TCP port <port>"));
+        printf("    %s\n", _("UPTIME        = system uptime in seconds"));
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-  printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-  printf ("\n");
-  printf ("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be"));
-  printf ("%s\n", _("running on the remote server."));
-  printf ("%s\n", _("Over-CR can be downloaded from http://www.molitor.org/overcr"));
-  printf ("%s\n", _("This plugin was tested with version 0.99.53 of the Over-CR collector"));
+        printf("\n");
+        printf("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be"));
+        printf("%s\n", _("running on the remote server."));
+        printf("%s\n", _("Over-CR can be downloaded from http://www.molitor.org/overcr"));
+        printf("%s\n", _("This plugin was tested with version 0.99.53 of the Over-CR collector"));
 
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("For the available options, the critical threshold value should always be"));
-  printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("For the available options, the critical threshold value should always be"));
+        printf(" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
 
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n", progname);
 }
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 94d589e..6613634 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-* 
-* Monitoring check_pgsql plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2011 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_pgsql plugin
-* 
-* Test whether a PostgreSQL Database is accepting connections.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_pgsql plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_pgsql plugin
+ *
+ * Test whether a PostgreSQL Database is accepting connections.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_pgsql";
-const char *copyright = "1999-2011";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -40,22 +40,18 @@ const char *email = "devel@monitoring-plugins.org";
 #include <libpq-fe.h>
 #include <pg_config_manual.h>
 
-#define DEFAULT_DB "template1"
+#define DEFAULT_DB   "template1"
 #define DEFAULT_HOST "127.0.0.1"
 
 /* return the PSQL server version as a 3-tuple */
-#define PSQL_SERVER_VERSION3(server_version) \
-        (server_version) / 10000, \
-        (server_version) / 100 - (int)((server_version) / 10000) * 100, \
-        (server_version) - (int)((server_version) / 100) * 100
+#define PSQL_SERVER_VERSION3(server_version)                                                                                               \
+        (server_version) / 10000, (server_version) / 100 - (int)((server_version) / 10000) * 100,                                              \
+                (server_version) - (int)((server_version) / 100) * 100
 /* return true if the given host is a UNIX domain socket */
-#define PSQL_IS_UNIX_DOMAIN_SOCKET(host) \
-        ((NULL == (host)) || ('\0' == *(host)) || ('/' == *(host)))
+#define PSQL_IS_UNIX_DOMAIN_SOCKET(host) ((NULL == (host)) || ('\0' == *(host)) || ('/' == *(host)))
 /* return a 3-tuple identifying a host/port independent of the socket type */
-#define PSQL_SOCKET3(host, port) \
-        ((NULL == (host)) || ('\0' == *(host))) ? DEFAULT_PGSOCKET_DIR : host, \
-        PSQL_IS_UNIX_DOMAIN_SOCKET (host) ? "/.s.PGSQL." : ":", \
-        port
+#define PSQL_SOCKET3(host, port)                                                                                                           \
+        ((NULL == (host)) || ('\0' == *(host))) ? DEFAULT_PGSOCKET_DIR : host, PSQL_IS_UNIX_DOMAIN_SOCKET(host) ? "/.s.PGSQL." : ":", port
 
 enum {
         DEFAULT_PORT = 5432,
@@ -63,33 +59,30 @@ enum {
         DEFAULT_CRIT = 8
 };
 
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+static bool is_pg_logname(char * /*username*/);
+static int do_query(PGconn * /*conn*/, char * /*query*/);
+void print_usage(void);
+
+static char *pghost = NULL; /* host name of the backend server */
+static char *pgport = NULL; /* port of the backend server */
+static char *pgoptions = NULL;
+static char *pgtty = NULL;
+static char dbName[NAMEDATALEN] = DEFAULT_DB;
+static char *pguser = NULL;
+static char *pgpasswd = NULL;
+static char *pgparams = NULL;
+static double twarn = (double)DEFAULT_WARN;
+static double tcrit = (double)DEFAULT_CRIT;
+static char *pgquery = NULL;
+static char *pgqueryname = NULL;
+static char *query_warning = NULL;
+static char *query_critical = NULL;
+static thresholds *qthresholds = NULL;
+static int verbose = 0;
 
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_usage (void);
-void print_help (void);
-bool is_pg_logname (char *);
-int do_query (PGconn *, char *);
-
-char *pghost = NULL;                                            /* host name of the backend server */
-char *pgport = NULL;                                            /* port of the backend server */
-int default_port = DEFAULT_PORT;
-char *pgoptions = NULL;
-char *pgtty = NULL;
-char dbName[NAMEDATALEN] = DEFAULT_DB;
-char *pguser = NULL;
-char *pgpasswd = NULL;
-char *pgparams = NULL;
-double twarn = (double)DEFAULT_WARN;
-double tcrit = (double)DEFAULT_CRIT;
-char *pgquery = NULL;
 #define OPTID_QUERYNAME -1000
-char *pgqueryname = NULL;
-char *query_warning = NULL;
-char *query_critical = NULL;
-thresholds *qthresholds = NULL;
-int verbose = 0;
 
 /******************************************************************************
 
@@ -141,78 +134,67 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 -@@
 ******************************************************************************/
 
-
-
-int
-main (int argc, char **argv)
-{
-        PGconn *conn;
-        char *conninfo = NULL;
-
-        struct timeval start_timeval;
-        struct timeval end_timeval;
-        double elapsed_time;
-        int status = STATE_UNKNOWN;
-        int query_status = STATE_UNKNOWN;
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* begin, by setting the parameters for a backend connection if the
          * parameters are null, then the system will try to use reasonable
          * defaults by looking up environment variables or, failing that,
          * using hardwired constants */
 
-        pgoptions = NULL;  /* special options to start up the backend server */
-        pgtty = NULL;      /* debugging tty for the backend server */
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        pgoptions = NULL; /* special options to start up the backend server */
+        pgtty = NULL;     /* debugging tty for the backend server */
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
         if (verbose > 2)
                 printf("Arguments initialized\n");
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
+        char *conninfo = NULL;
         if (pgparams)
-                asprintf (&conninfo, "%s ", pgparams);
+                asprintf(&conninfo, "%s ", pgparams);
 
-        asprintf (&conninfo, "%sdbname = '%s'", conninfo ? conninfo : "", dbName);
+        asprintf(&conninfo, "%sdbname = '%s'", conninfo ? conninfo : "", dbName);
         if (pghost)
-                asprintf (&conninfo, "%s host = '%s'", conninfo, pghost);
+                asprintf(&conninfo, "%s host = '%s'", conninfo, pghost);
         if (pgport)
-                asprintf (&conninfo, "%s port = '%s'", conninfo, pgport);
+                asprintf(&conninfo, "%s port = '%s'", conninfo, pgport);
         if (pgoptions)
-                asprintf (&conninfo, "%s options = '%s'", conninfo, pgoptions);
+                asprintf(&conninfo, "%s options = '%s'", conninfo, pgoptions);
         /* if (pgtty) -- ignored by PQconnectdb */
         if (pguser)
-                asprintf (&conninfo, "%s user = '%s'", conninfo, pguser);
+                asprintf(&conninfo, "%s user = '%s'", conninfo, pguser);
 
         if (verbose) /* do not include password (see right below) in output */
-                printf ("Connecting to PostgreSQL using conninfo: %s%s\n", conninfo,
-                                pgpasswd ? " password = <hidden>" : "");
+                printf("Connecting to PostgreSQL using conninfo: %s%s\n", conninfo, pgpasswd ? " password = <hidden>" : "");
 
         if (pgpasswd)
-                asprintf (&conninfo, "%s password = '%s'", conninfo, pgpasswd);
+                asprintf(&conninfo, "%s password = '%s'", conninfo, pgpasswd);
 
         /* make a connection to the database */
-        gettimeofday (&start_timeval, NULL);
-        conn = PQconnectdb (conninfo);
-        gettimeofday (&end_timeval, NULL);
+        struct timeval start_timeval;
+        gettimeofday(&start_timeval, NULL);
+        PGconn *conn = PQconnectdb(conninfo);
+        struct timeval end_timeval;
+        gettimeofday(&end_timeval, NULL);
 
         while (start_timeval.tv_usec > end_timeval.tv_usec) {
                 --end_timeval.tv_sec;
                 end_timeval.tv_usec += 1000000;
         }
-        elapsed_time = (double)(end_timeval.tv_sec - start_timeval.tv_sec)
-                + (double)(end_timeval.tv_usec - start_timeval.tv_usec) / 1000000.0;
+        double elapsed_time =
+                (double)(end_timeval.tv_sec - start_timeval.tv_sec) + (double)(end_timeval.tv_usec - start_timeval.tv_usec) / 1000000.0;
 
         if (verbose)
                 printf("Time elapsed: %f\n", elapsed_time);
@@ -220,152 +202,139 @@ main (int argc, char **argv)
         /* check to see that the backend connection was successfully made */
         if (verbose)
                 printf("Verifying connection\n");
-        if (PQstatus (conn) == CONNECTION_BAD) {
-                printf (_("CRITICAL - no connection to '%s' (%s).\n"),
-                        dbName, PQerrorMessage (conn));
-                PQfinish (conn);
+        if (PQstatus(conn) == CONNECTION_BAD) {
+                printf(_("CRITICAL - no connection to '%s' (%s).\n"), dbName, PQerrorMessage(conn));
+                PQfinish(conn);
                 return STATE_CRITICAL;
         }
-        else if (elapsed_time > tcrit) {
+
+        int status = STATE_UNKNOWN;
+        if (elapsed_time > tcrit) {
                 status = STATE_CRITICAL;
-        }
-        else if (elapsed_time > twarn) {
+        } else if (elapsed_time > twarn) {
                 status = STATE_WARNING;
-        }
-        else {
+        } else {
                 status = STATE_OK;
         }
 
         if (verbose) {
-                char *server_host = PQhost (conn);
-                int server_version = PQserverVersion (conn);
-
-                printf ("Successfully connected to database %s (user %s) "
-                                "at server %s%s%s (server version: %d.%d.%d, "
-                                "protocol version: %d, pid: %d)\n",
-                                PQdb (conn), PQuser (conn),
-                                PSQL_SOCKET3 (server_host, PQport (conn)),
-                                PSQL_SERVER_VERSION3 (server_version),
-                                PQprotocolVersion (conn), PQbackendPID (conn));
+                char *server_host = PQhost(conn);
+                int server_version = PQserverVersion(conn);
+
+                printf("Successfully connected to database %s (user %s) "
+                           "at server %s%s%s (server version: %d.%d.%d, "
+                           "protocol version: %d, pid: %d)\n",
+                           PQdb(conn), PQuser(conn), PSQL_SOCKET3(server_host, PQport(conn)), PSQL_SERVER_VERSION3(server_version),
+                           PQprotocolVersion(conn), PQbackendPID(conn));
         }
 
-        printf (_(" %s - database %s (%f sec.)|%s\n"),
-                state_text(status), dbName, elapsed_time,
-                fperfdata("time", elapsed_time, "s",
-                         !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, true, 0, false,0));
+        printf(_(" %s - database %s (%f sec.)|%s\n"), state_text(status), dbName, elapsed_time,
+                   fperfdata("time", elapsed_time, "s", !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, true, 0, false, 0));
 
+        int query_status = STATE_UNKNOWN;
         if (pgquery)
-                query_status = do_query (conn, pgquery);
+                query_status = do_query(conn, pgquery);
 
         if (verbose)
                 printf("Closing connection\n");
-        PQfinish (conn);
+        PQfinish(conn);
         return (pgquery && query_status > status) ? query_status : status;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"help", no_argument, 0, 'h'},
-                {"version", no_argument, 0, 'V'},
-                {"timeout", required_argument, 0, 't'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"hostname", required_argument, 0, 'H'},
-                {"logname", required_argument, 0, 'l'},
-                {"password", required_argument, 0, 'p'},
-                {"authorization", required_argument, 0, 'a'},
-                {"port", required_argument, 0, 'P'},
-                {"database", required_argument, 0, 'd'},
-                {"option", required_argument, 0, 'o'},
-                {"query", required_argument, 0, 'q'},
-                {"queryname", required_argument, 0, OPTID_QUERYNAME},
-                {"query_critical", required_argument, 0, 'C'},
-                {"query_warning", required_argument, 0, 'W'},
-                {"verbose", no_argument, 0, 'v'},
-                {0, 0, 0, 0}
-        };
-
-        while (1) {
-                c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:o:q:C:W:v",
-                                 longopts, &option);
-
-                if (c == EOF)
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"help", no_argument, 0, 'h'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"logname", required_argument, 0, 'l'},
+                                                                           {"password", required_argument, 0, 'p'},
+                                                                           {"authorization", required_argument, 0, 'a'},
+                                                                           {"port", required_argument, 0, 'P'},
+                                                                           {"database", required_argument, 0, 'd'},
+                                                                           {"option", required_argument, 0, 'o'},
+                                                                           {"query", required_argument, 0, 'q'},
+                                                                           {"queryname", required_argument, 0, OPTID_QUERYNAME},
+                                                                           {"query_critical", required_argument, 0, 'C'},
+                                                                           {"query_warning", required_argument, 0, 'W'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {0, 0, 0, 0}};
+
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "hVt:c:w:H:P:d:l:p:a:o:q:C:W:v", longopts, &option);
+
+                if (option_char == EOF)
                         break;
 
-                switch (c) {
-                case '?':     /* usage */
-                        usage5 ();
-                case 'h':     /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 't':     /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                switch (option_char) {
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 't': /* timeout period */
+                        if (!is_integer(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
                         else
-                                timeout_interval = atoi (optarg);
+                                timeout_interval = atoi(optarg);
                         break;
-                case 'c':     /* critical time threshold */
-                        if (!is_nonnegative (optarg))
-                                usage2 (_("Critical threshold must be a positive integer"), optarg);
+                case 'c': /* critical time threshold */
+                        if (!is_nonnegative(optarg))
+                                usage2(_("Critical threshold must be a positive integer"), optarg);
                         else
-                                tcrit = strtod (optarg, NULL);
+                                tcrit = strtod(optarg, NULL);
                         break;
-                case 'w':     /* warning time threshold */
-                        if (!is_nonnegative (optarg))
-                                usage2 (_("Warning threshold must be a positive integer"), optarg);
+                case 'w': /* warning time threshold */
+                        if (!is_nonnegative(optarg))
+                                usage2(_("Warning threshold must be a positive integer"), optarg);
                         else
-                                twarn = strtod (optarg, NULL);
+                                twarn = strtod(optarg, NULL);
                         break;
-                case 'C':     /* critical query threshold */
+                case 'C': /* critical query threshold */
                         query_critical = optarg;
                         break;
-                case 'W':     /* warning query threshold */
+                case 'W': /* warning query threshold */
                         query_warning = optarg;
                         break;
-                case 'H':     /* host */
-                        if ((*optarg != '/') && (!is_host (optarg)))
-                                usage2 (_("Invalid hostname/address"), optarg);
+                case 'H': /* host */
+                        if ((*optarg != '/') && (!is_host(optarg)))
+                                usage2(_("Invalid hostname/address"), optarg);
                         else
                                 pghost = optarg;
                         break;
-                case 'P':     /* port */
-                        if (!is_integer (optarg))
-                                usage2 (_("Port must be a positive integer"), optarg);
+                case 'P': /* port */
+                        if (!is_integer(optarg))
+                                usage2(_("Port must be a positive integer"), optarg);
                         else
                                 pgport = optarg;
                         break;
-                case 'd':     /* database name */
+                case 'd': /* database name */
                         if (strlen(optarg) >= NAMEDATALEN) {
-                                usage2 (_("Database name exceeds the maximum length"), optarg);
+                                usage2(_("Database name exceeds the maximum length"), optarg);
                         }
                         snprintf(dbName, NAMEDATALEN, "%s", optarg);
                         break;
-                case 'l':     /* login name */
-                        if (!is_pg_logname (optarg))
-                                usage2 (_("User name is not valid"), optarg);
+                case 'l': /* login name */
+                        if (!is_pg_logname(optarg))
+                                usage2(_("User name is not valid"), optarg);
                         else
                                 pguser = optarg;
                         break;
-                case 'p':     /* authentication password */
+                case 'p': /* authentication password */
                 case 'a':
                         pgpasswd = optarg;
                         break;
                 case 'o':
                         if (pgparams)
-                                asprintf (&pgparams, "%s %s", pgparams, optarg);
+                                asprintf(&pgparams, "%s %s", pgparams, optarg);
                         else
-                                asprintf (&pgparams, "%s", optarg);
+                                asprintf(&pgparams, "%s", optarg);
                         break;
                 case 'q':
                         pgquery = optarg;
@@ -379,37 +348,8 @@ process_arguments (int argc, char **argv)
                 }
         }
 
-        set_thresholds (&qthresholds, query_warning, query_critical);
-
-        return validate_arguments ();
-}
-
-
-/******************************************************************************
-
-@@-
-<sect3>
-<title>validate_arguments</title>
-
-<para>&PROTO_validate_arguments;</para>
-
-<para>Given a database name, this function returns true if the string
-is a valid PostgreSQL database name, and returns false if it is
-not.</para>
+        set_thresholds(&qthresholds, query_warning, query_critical);
 
-<para>Valid PostgreSQL database names are less than &NAMEDATALEN;
-characters long and consist of letters, numbers, and underscores. The
-first character cannot be a number, however.</para>
-
-</sect3>
--@@
-******************************************************************************/
-
-
-
-int
-validate_arguments ()
-{
         return OK;
 }
 
@@ -437,10 +377,8 @@ should be added.</para>
 -@@
 ******************************************************************************/
 
-
-
-bool is_pg_logname (char *username) {
-        if (strlen (username) > NAMEDATALEN - 1)
+bool is_pg_logname(char *username) {
+        if (strlen(username) > NAMEDATALEN - 1)
                 return (false);
         return (true);
 }
@@ -453,182 +391,155 @@ bool is_pg_logname (char *username) {
 -@@
 ******************************************************************************/
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
 
-        xasprintf (&myport, "%d", DEFAULT_PORT);
+        xasprintf(&myport, "%d", DEFAULT_PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
-        printf (_("Test whether a PostgreSQL Database is accepting connections."));
+        printf(_("Test whether a PostgreSQL Database is accepting connections."));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_HOST_PORT, 'P', myport);
+        printf(UT_HOST_PORT, 'P', myport);
 
-        printf (" %s\n", "-d, --database=STRING");
-        printf ("    %s", _("Database to check "));
-        printf (_("(default: %s)\n"), DEFAULT_DB);
-        printf (" %s\n", "-l, --logname = STRING");
-        printf ("    %s\n", _("Login name of user"));
-        printf (" %s\n", "-p, --password = STRING");
-        printf ("    %s\n", _("Password (BIG SECURITY ISSUE)"));
-        printf (" %s\n", "-o, --option = STRING");
-        printf ("    %s\n", _("Connection parameters (keyword = value), see below"));
+        printf(" %s\n", "-d, --database=STRING");
+        printf("    %s", _("Database to check "));
+        printf(_("(default: %s)\n"), DEFAULT_DB);
+        printf(" %s\n", "-l, --logname = STRING");
+        printf("    %s\n", _("Login name of user"));
+        printf(" %s\n", "-p, --password = STRING");
+        printf("    %s\n", _("Password (BIG SECURITY ISSUE)"));
+        printf(" %s\n", "-o, --option = STRING");
+        printf("    %s\n", _("Connection parameters (keyword = value), see below"));
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (" %s\n", "-q, --query=STRING");
-        printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
-        printf (" %s\n", "--queryname=STRING");
-        printf ("    %s\n", _("A name for the query, this string is used instead of the query"));
-        printf ("    %s\n", _("in the long output of the plugin"));
-        printf (" %s\n", "-W, --query-warning=RANGE");
-        printf ("    %s\n", _("SQL query value to result in warning status (double)"));
-        printf (" %s\n", "-C, --query-critical=RANGE");
-        printf ("    %s\n", _("SQL query value to result in critical status (double)"));
+        printf(" %s\n", "-q, --query=STRING");
+        printf("    %s\n", _("SQL query to run. Only first column in first row will be read"));
+        printf(" %s\n", "--queryname=STRING");
+        printf("    %s\n", _("A name for the query, this string is used instead of the query"));
+        printf("    %s\n", _("in the long output of the plugin"));
+        printf(" %s\n", "-W, --query-warning=RANGE");
+        printf("    %s\n", _("SQL query value to result in warning status (double)"));
+        printf(" %s\n", "-C, --query-critical=RANGE");
+        printf("    %s\n", _("SQL query value to result in critical status (double)"));
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-        printf ("\n");
-        printf (" %s\n", _("All parameters are optional."));
-        printf (" %s\n", _("This plugin tests a PostgreSQL DBMS to determine whether it is active and"));
-        printf (" %s\n", _("accepting queries. In its current operation, it simply connects to the"));
-        printf (" %s\n", _("specified database, and then disconnects. If no database is specified, it"));
-        printf (" %s\n", _("connects to the template1 database, which is present in every functioning"));
-        printf (" %s\n\n", _("PostgreSQL DBMS."));
+        printf("\n");
+        printf(" %s\n", _("All parameters are optional."));
+        printf(" %s\n", _("This plugin tests a PostgreSQL DBMS to determine whether it is active and"));
+        printf(" %s\n", _("accepting queries. In its current operation, it simply connects to the"));
+        printf(" %s\n", _("specified database, and then disconnects. If no database is specified, it"));
+        printf(" %s\n", _("connects to the template1 database, which is present in every functioning"));
+        printf(" %s\n\n", _("PostgreSQL DBMS."));
 
-        printf (" %s\n", _("If a query is specified using the -q option, it will be executed after"));
-        printf (" %s\n", _("connecting to the server. The result from the query has to be numeric."));
-        printf (" %s\n", _("Multiple SQL commands, separated by semicolon, are allowed but the result "));
-        printf (" %s\n", _("of the last command is taken into account only. The value of the first"));
-        printf (" %s\n", _("column in the first row is used as the check result. If a second column is"));
-        printf (" %s\n", _("present in the result set, this is added to the plugin output with a"));
-        printf (" %s\n", _("prefix of \"Extra Info:\". This information can be displayed in the system"));
-        printf (" %s\n\n", _("executing the plugin."));
+        printf(" %s\n", _("If a query is specified using the -q option, it will be executed after"));
+        printf(" %s\n", _("connecting to the server. The result from the query has to be numeric."));
+        printf(" %s\n", _("Multiple SQL commands, separated by semicolon, are allowed but the result "));
+        printf(" %s\n", _("of the last command is taken into account only. The value of the first"));
+        printf(" %s\n", _("column in the first row is used as the check result. If a second column is"));
+        printf(" %s\n", _("present in the result set, this is added to the plugin output with a"));
+        printf(" %s\n", _("prefix of \"Extra Info:\". This information can be displayed in the system"));
+        printf(" %s\n\n", _("executing the plugin."));
 
-        printf (" %s\n", _("See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"));
-        printf (" %s\n\n", _("for details about how to access internal statistics of the database server."));
+        printf(" %s\n", _("See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"));
+        printf(" %s\n\n", _("for details about how to access internal statistics of the database server."));
 
-        printf (" %s\n", _("For a list of available connection parameters which may be used with the -o"));
-        printf (" %s\n", _("command line option, see the documentation for PQconnectdb() in the chapter"));
-        printf (" %s\n", _("\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"));
-        printf (" %s\n", _("used to specify a service name in pg_service.conf to be used for additional"));
-        printf (" %s\n", _("connection parameters: -o 'service=<name>' or to specify the SSL mode:"));
-        printf (" %s\n\n", _("-o 'sslmode=require'."));
+        printf(" %s\n", _("For a list of available connection parameters which may be used with the -o"));
+        printf(" %s\n", _("command line option, see the documentation for PQconnectdb() in the chapter"));
+        printf(" %s\n", _("\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"));
+        printf(" %s\n", _("used to specify a service name in pg_service.conf to be used for additional"));
+        printf(" %s\n", _("connection parameters: -o 'service=<name>' or to specify the SSL mode:"));
+        printf(" %s\n\n", _("-o 'sslmode=require'."));
 
-        printf (" %s\n", _("The plugin will connect to a local postmaster if no host is specified. To"));
-        printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
-        printf (" %s\n\n", _("connections (start the postmaster with the -i option)."));
+        printf(" %s\n", _("The plugin will connect to a local postmaster if no host is specified. To"));
+        printf(" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
+        printf(" %s\n\n", _("connections (start the postmaster with the -i option)."));
 
-        printf (" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be"));
-        printf (" %s\n", _("able to connect to the database without a password. The plugin can also send"));
-        printf (" %s\n", _("a password, but no effort is made to obscure or encrypt the password."));
+        printf(" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be"));
+        printf(" %s\n", _("able to connect to the database without a password. The plugin can also send"));
+        printf(" %s\n", _("a password, but no effort is made to obscure or encrypt the password."));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
-        printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n"
-                        "[-q <query>] [-C <critical query range>] [-W <warning query range>]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
+        printf(" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n"
+                   "[-q <query>] [-C <critical query range>] [-W <warning query range>]\n");
 }
 
-int
-do_query (PGconn *conn, char *query)
-{
-        PGresult *res;
-
-        char *val_str;
-        char *extra_info;
-        double value;
-
-        char *endptr = NULL;
-
-        int my_status = STATE_UNKNOWN;
-
+int do_query(PGconn *conn, char *query) {
         if (verbose)
-                printf ("Executing SQL query \"%s\".\n", query);
-        res = PQexec (conn, query);
+                printf("Executing SQL query \"%s\".\n", query);
+        PGresult *res = PQexec(conn, query);
 
-        if (PGRES_TUPLES_OK != PQresultStatus (res)) {
-                printf (_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"),
-                                        PQerrorMessage (conn));
+        if (PGRES_TUPLES_OK != PQresultStatus(res)) {
+                printf(_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"), PQerrorMessage(conn));
                 return STATE_CRITICAL;
         }
 
-        if (PQntuples (res) < 1) {
-                printf ("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
+        if (PQntuples(res) < 1) {
+                printf("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
                 return STATE_WARNING;
         }
 
-        if (PQnfields (res) < 1) {
-                printf ("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
+        if (PQnfields(res) < 1) {
+                printf("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
                 return STATE_WARNING;
         }
 
-        val_str = PQgetvalue (res, 0, 0);
-        if (! val_str) {
-                printf ("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
+        char *val_str = PQgetvalue(res, 0, 0);
+        if (!val_str) {
+                printf("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
                 return STATE_CRITICAL;
         }
 
-        value = strtod (val_str, &endptr);
+        char *endptr = NULL;
+        double value = strtod(val_str, &endptr);
         if (verbose)
-                printf ("Query result: %f\n", value);
+                printf("Query result: %f\n", value);
 
         if (endptr == val_str) {
-                printf ("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
+                printf("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
                 return STATE_CRITICAL;
         }
-        else if ((endptr != NULL) && (*endptr != '\0')) {
+
+        if ((endptr != NULL) && (*endptr != '\0')) {
                 if (verbose)
-                        printf ("Garbage after value: %s.\n", endptr);
+                        printf("Garbage after value: %s.\n", endptr);
         }
 
-        my_status = get_status (value, qthresholds);
-        printf ("QUERY %s - ",
-                        (my_status == STATE_OK)
-                                ? _("OK")
-                                : (my_status == STATE_WARNING)
-                                        ? _("WARNING")
-                                        : (my_status == STATE_CRITICAL)
-                                                ? _("CRITICAL")
-                                                : _("UNKNOWN"));
-        if(pgqueryname) {
-                printf (_("%s returned %f"), pgqueryname, value);
-        }
-        else {
-                printf (_("'%s' returned %f"), query, value);
+        int my_status = get_status(value, qthresholds);
+        printf("QUERY %s - ", (my_status == STATE_OK)         ? _("OK")
+                                                  : (my_status == STATE_WARNING)  ? _("WARNING")
+                                                  : (my_status == STATE_CRITICAL) ? _("CRITICAL")
+                                                                                                                  : _("UNKNOWN"));
+        if (pgqueryname) {
+                printf(_("%s returned %f"), pgqueryname, value);
+        } else {
+                printf(_("'%s' returned %f"), query, value);
         }
 
-        printf ("|query=%f;%s;%s;;\n", value,
-                        query_warning ? query_warning : "",
-                        query_critical ? query_critical : "");
-        if (PQnfields (res) > 1) {
-                extra_info = PQgetvalue (res, 0, 1);
+        printf("|query=%f;%s;%s;;\n", value, query_warning ? query_warning : "", query_critical ? query_critical : "");
+        if (PQnfields(res) > 1) {
+                char *extra_info = PQgetvalue(res, 0, 1);
                 if (extra_info != NULL) {
-                        printf ("Extra Info: %s\n", extra_info);
+                        printf("Extra Info: %s\n", extra_info);
                 }
         }
         return my_status;
 }
-
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 6e162e6..4aafaf4 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-* 
-* Monitoring check_ping plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ping plugin
-* 
-* Use the ping program to check connection statistics for a remote host.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_ping plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ping plugin
+ *
+ * Use the ping program to check connection statistics for a remote host.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_ping";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -39,77 +39,73 @@ const char *email = "devel@monitoring-plugins.org";
 
 #include <signal.h>
 
-#define WARN_DUPLICATES "DUPLICATES FOUND! "
-#define UNKNOWN_TRIP_TIME -1.0  /* -1 seconds */
+#define WARN_DUPLICATES   "DUPLICATES FOUND! "
+#define UNKNOWN_TRIP_TIME -1.0 /* -1 seconds */
 
 enum {
-        UNKNOWN_PACKET_LOSS = 200,    /* 200% */
-        DEFAULT_MAX_PACKETS = 5       /* default no. of ICMP ECHO packets */
+        UNKNOWN_PACKET_LOSS = 200, /* 200% */
+        DEFAULT_MAX_PACKETS = 5    /* default no. of ICMP ECHO packets */
 };
 
-int process_arguments (int, char **);
-int get_threshold (char *, float *, int *);
-int validate_arguments (void);
-int run_ping (const char *cmd, const char *addr);
-int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr);
-void print_usage (void);
-void print_help (void);
-
-bool display_html = false;
-int wpl = UNKNOWN_PACKET_LOSS;
-int cpl = UNKNOWN_PACKET_LOSS;
-float wrta = UNKNOWN_TRIP_TIME;
-float crta = UNKNOWN_TRIP_TIME;
-char **addresses = NULL;
-int n_addresses = 0;
-int max_addr = 1;
-int max_packets = -1;
-int verbose = 0;
-
-float rta = UNKNOWN_TRIP_TIME;
-int pl = UNKNOWN_PACKET_LOSS;
-
-char *warn_text;
-
-
-
-int
-main (int argc, char **argv)
-{
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static int get_threshold(char * /*arg*/, float * /*trta*/, int * /*tpl*/);
+static int validate_arguments(void);
+static int run_ping(const char *cmd, const char *addr);
+static int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr);
+static void print_help(void);
+void print_usage(void);
+
+static bool display_html = false;
+static int wpl = UNKNOWN_PACKET_LOSS;
+static int cpl = UNKNOWN_PACKET_LOSS;
+static float wrta = UNKNOWN_TRIP_TIME;
+static float crta = UNKNOWN_TRIP_TIME;
+static char **addresses = NULL;
+static int n_addresses = 0;
+static int max_addr = 1;
+static int max_packets = -1;
+static int verbose = 0;
+
+static float rta = UNKNOWN_TRIP_TIME;
+static int pl = UNKNOWN_PACKET_LOSS;
+
+static char *warn_text;
+
+int main(int argc, char **argv) {
         char *cmd = NULL;
         char *rawcmd = NULL;
         int result = STATE_UNKNOWN;
         int this_result = STATE_UNKNOWN;
         int i;
 
-        setlocale (LC_ALL, "");
-        setlocale (LC_NUMERIC, "C");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        setlocale(LC_NUMERIC, "C");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-        addresses = malloc (sizeof(char*) * max_addr);
+        addresses = malloc(sizeof(char *) * max_addr);
         addresses[0] = NULL;
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
 
         /* If ./configure finds ping has timeout values, set plugin alarm slightly
          * higher so that we can use response from command line ping */
 #if defined(PING_PACKETS_FIRST) && defined(PING_HAS_TIMEOUT)
-        alarm (timeout_interval + 1);
+        alarm(timeout_interval + 1);
 #else
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 #endif
 
-        for (i = 0 ; i < n_addresses ; i++) {
+        for (i = 0; i < n_addresses; i++) {
 
 #ifdef PING6_COMMAND
                 if (address_family != AF_INET && is_inet6_addr(addresses[i]))
@@ -120,27 +116,26 @@ main (int argc, char **argv)
                 rawcmd = strdup(PING_COMMAND);
 #endif
 
-                /* does the host address of number of packets argument come first? */
+                        /* does the host address of number of packets argument come first? */
 #ifdef PING_PACKETS_FIRST
-# ifdef PING_HAS_TIMEOUT
-                xasprintf (&cmd, rawcmd, timeout_interval, max_packets, addresses[i]);
-# else
-                xasprintf (&cmd, rawcmd, max_packets, addresses[i]);
-# endif
+#       ifdef PING_HAS_TIMEOUT
+                xasprintf(&cmd, rawcmd, timeout_interval, max_packets, addresses[i]);
+#       else
+                xasprintf(&cmd, rawcmd, max_packets, addresses[i]);
+#       endif
 #else
-                xasprintf (&cmd, rawcmd, addresses[i], max_packets);
+                xasprintf(&cmd, rawcmd, addresses[i], max_packets);
 #endif
 
                 if (verbose >= 2)
-                        printf ("CMD: %s\n", cmd);
+                        printf("CMD: %s\n", cmd);
 
                 /* run the command */
-                this_result = run_ping (cmd, addresses[i]);
+                this_result = run_ping(cmd, addresses[i]);
 
                 if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) {
-                        printf ("%s\n", cmd);
-                        die (STATE_UNKNOWN,
-                                _("CRITICAL - Could not interpret output from ping command\n"));
+                        printf("%s\n", cmd);
+                        die(STATE_UNKNOWN, _("CRITICAL - Could not interpret output from ping command\n"));
                 }
 
                 if (pl >= cpl || rta >= crta || rta < 0)
@@ -148,267 +143,241 @@ main (int argc, char **argv)
                 else if (pl >= wpl || rta >= wrta)
                         this_result = STATE_WARNING;
                 else if (pl >= 0 && rta >= 0)
-                        this_result = max_state (STATE_OK, this_result);
+                        this_result = max_state(STATE_OK, this_result);
 
                 if (n_addresses > 1 && this_result != STATE_UNKNOWN)
-                        die (STATE_OK, "%s is alive\n", addresses[i]);
+                        die(STATE_OK, "%s is alive\n", addresses[i]);
 
                 if (display_html == true)
-                        printf ("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, addresses[i]);
+                        printf("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, addresses[i]);
                 if (pl == 100)
-                        printf (_("PING %s - %sPacket loss = %d%%"), state_text (this_result), warn_text,
-                                                        pl);
+                        printf(_("PING %s - %sPacket loss = %d%%"), state_text(this_result), warn_text, pl);
                 else
-                        printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"),
-                                                        state_text (this_result), warn_text, pl, rta);
+                        printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(this_result), warn_text, pl, rta);
                 if (display_html == true)
-                        printf ("</A>");
+                        printf("</A>");
 
                 /* Print performance data */
                 if (pl != 100) {
-                        printf("|%s", fperfdata ("rta", (double) rta, "ms",
-                                                                          wrta>0?true:false, wrta,
-                                                                          crta>0?true:false, crta,
-                                                                          true, 0, false, 0));
+                        printf("|%s",
+                                   fperfdata("rta", (double)rta, "ms", wrta > 0 ? true : false, wrta, crta > 0 ? true : false, crta, true, 0, false, 0));
                 } else {
                         printf("| rta=U;%f;%f;;", wrta, crta);
                 }
-                printf(" %s\n", perfdata ("pl", (long) pl, "%",
-                                          wpl>0?true:false, wpl,
-                                          cpl>0?true:false, cpl,
-                                          true, 0, false, 0));
+                printf(" %s\n", perfdata("pl", (long)pl, "%", wpl > 0 ? true : false, wpl, cpl > 0 ? true : false, cpl, true, 0, false, 0));
 
                 if (verbose >= 2)
-                        printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
+                        printf("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
 
-                result = max_state (result, this_result);
-                free (rawcmd);
-                free (cmd);
+                result = max_state(result, this_result);
+                free(rawcmd);
+                free(cmd);
         }
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
+int process_arguments(int argc, char **argv) {
         int c = 1;
         char *ptr;
 
         int option = 0;
-        static struct option longopts[] = {
-                STD_LONG_OPTS,
-                {"packets", required_argument, 0, 'p'},
-                {"nohtml", no_argument, 0, 'n'},
-                {"link", no_argument, 0, 'L'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {STD_LONG_OPTS,
+                                                                           {"packets", required_argument, 0, 'p'},
+                                                                           {"nohtml", no_argument, 0, 'n'},
+                                                                           {"link", no_argument, 0, 'L'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
         for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                if (strcmp ("-nohtml", argv[c]) == 0)
-                        strcpy (argv[c], "-n");
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+                if (strcmp("-nohtml", argv[c]) == 0)
+                        strcpy(argv[c], "-n");
         }
 
         while (1) {
-                c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
+                c = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
 
                 if (c == -1 || c == EOF)
                         break;
 
                 switch (c) {
-                case '?':       /* usage */
-                        usage5 ();
-                case 'h':       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
                         break;
-                case 'V':       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
                         break;
-                case 't':       /* timeout period */
-                        timeout_interval = atoi (optarg);
+                case 't': /* timeout period */
+                        timeout_interval = atoi(optarg);
                         break;
-                case 'v':       /* verbose mode */
+                case 'v': /* verbose mode */
                         verbose++;
                         break;
-                case '4':       /* IPv4 only */
+                case '4': /* IPv4 only */
                         address_family = AF_INET;
                         break;
-                case '6':       /* IPv6 only */
+                case '6': /* IPv6 only */
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage (_("IPv6 support not available\n"));
+                        usage(_("IPv6 support not available\n"));
 #endif
                         break;
-                case 'H':       /* hostname */
-                        ptr=optarg;
+                case 'H': /* hostname */
+                        ptr = optarg;
                         while (1) {
                                 n_addresses++;
                                 if (n_addresses > max_addr) {
                                         max_addr *= 2;
-                                        addresses = realloc (addresses, sizeof(char*) * max_addr);
+                                        addresses = realloc(addresses, sizeof(char *) * max_addr);
                                         if (addresses == NULL)
-                                                die (STATE_UNKNOWN, _("Could not realloc() addresses\n"));
+                                                die(STATE_UNKNOWN, _("Could not realloc() addresses\n"));
                                 }
-                                addresses[n_addresses-1] = ptr;
-                                if ((ptr = index (ptr, ','))) {
-                                        strcpy (ptr, "");
+                                addresses[n_addresses - 1] = ptr;
+                                if ((ptr = index(ptr, ','))) {
+                                        strcpy(ptr, "");
                                         ptr += sizeof(char);
                                 } else {
                                         break;
                                 }
                         }
                         break;
-                case 'p':       /* number of packets to send */
-                        if (is_intnonneg (optarg))
-                                max_packets = atoi (optarg);
+                case 'p': /* number of packets to send */
+                        if (is_intnonneg(optarg))
+                                max_packets = atoi(optarg);
                         else
-                                usage2 (_("<max_packets> (%s) must be a non-negative number\n"), optarg);
+                                usage2(_("<max_packets> (%s) must be a non-negative number\n"), optarg);
                         break;
-                case 'n':       /* no HTML */
+                case 'n': /* no HTML */
                         display_html = false;
                         break;
-                case 'L':       /* show HTML */
+                case 'L': /* show HTML */
                         display_html = true;
                         break;
                 case 'c':
-                        get_threshold (optarg, &crta, &cpl);
+                        get_threshold(optarg, &crta, &cpl);
                         break;
                 case 'w':
-                        get_threshold (optarg, &wrta, &wpl);
+                        get_threshold(optarg, &wrta, &wpl);
                         break;
                 }
         }
 
         c = optind;
         if (c == argc)
-                return validate_arguments ();
+                return validate_arguments();
 
         if (addresses[0] == NULL) {
-                if (!is_host (argv[c])) {
-                        usage2 (_("Invalid hostname/address"), argv[c]);
+                if (!is_host(argv[c])) {
+                        usage2(_("Invalid hostname/address"), argv[c]);
                 } else {
                         addresses[0] = argv[c++];
                         n_addresses++;
                         if (c == argc)
-                                return validate_arguments ();
+                                return validate_arguments();
                 }
         }
 
         if (wpl == UNKNOWN_PACKET_LOSS) {
-                if (!is_intpercent (argv[c])) {
-                        printf (_("<wpl> (%s) must be an integer percentage\n"), argv[c]);
+                if (!is_intpercent(argv[c])) {
+                        printf(_("<wpl> (%s) must be an integer percentage\n"), argv[c]);
                         return ERROR;
                 } else {
-                        wpl = atoi (argv[c++]);
+                        wpl = atoi(argv[c++]);
                         if (c == argc)
-                                return validate_arguments ();
+                                return validate_arguments();
                 }
         }
 
         if (cpl == UNKNOWN_PACKET_LOSS) {
-                if (!is_intpercent (argv[c])) {
-                        printf (_("<cpl> (%s) must be an integer percentage\n"), argv[c]);
+                if (!is_intpercent(argv[c])) {
+                        printf(_("<cpl> (%s) must be an integer percentage\n"), argv[c]);
                         return ERROR;
                 } else {
-                        cpl = atoi (argv[c++]);
+                        cpl = atoi(argv[c++]);
                         if (c == argc)
-                                return validate_arguments ();
+                                return validate_arguments();
                 }
         }
 
         if (wrta < 0.0) {
-                if (is_negative (argv[c])) {
-                        printf (_("<wrta> (%s) must be a non-negative number\n"), argv[c]);
+                if (is_negative(argv[c])) {
+                        printf(_("<wrta> (%s) must be a non-negative number\n"), argv[c]);
                         return ERROR;
                 } else {
-                        wrta = atof (argv[c++]);
+                        wrta = atof(argv[c++]);
                         if (c == argc)
-                                return validate_arguments ();
+                                return validate_arguments();
                 }
         }
 
         if (crta < 0.0) {
-                if (is_negative (argv[c])) {
-                        printf (_("<crta> (%s) must be a non-negative number\n"), argv[c]);
+                if (is_negative(argv[c])) {
+                        printf(_("<crta> (%s) must be a non-negative number\n"), argv[c]);
                         return ERROR;
                 } else {
-                        crta = atof (argv[c++]);
+                        crta = atof(argv[c++]);
                         if (c == argc)
-                                return validate_arguments ();
+                                return validate_arguments();
                 }
         }
 
         if (max_packets == -1) {
-                if (is_intnonneg (argv[c])) {
-                        max_packets = atoi (argv[c++]);
+                if (is_intnonneg(argv[c])) {
+                        max_packets = atoi(argv[c++]);
                 } else {
-                        printf (_("<max_packets> (%s) must be a non-negative number\n"), argv[c]);
+                        printf(_("<max_packets> (%s) must be a non-negative number\n"), argv[c]);
                         return ERROR;
                 }
         }
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-
-
-int
-get_threshold (char *arg, float *trta, int *tpl)
-{
-        if (is_intnonneg (arg) && sscanf (arg, "%f", trta) == 1)
+int get_threshold(char *arg, float *trta, int *tpl) {
+        if (is_intnonneg(arg) && sscanf(arg, "%f", trta) == 1)
                 return OK;
-        else if (strpbrk (arg, ",:") && strstr (arg, "%") && sscanf (arg, "%f%*[:,]%d%%", trta, tpl) == 2)
+        else if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2)
                 return OK;
-        else if (strstr (arg, "%") && sscanf (arg, "%d%%", tpl) == 1)
+        else if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1)
                 return OK;
 
-        usage2 (_("%s: Warning threshold must be integer or percentage!\n\n"), arg);
+        usage2(_("%s: Warning threshold must be integer or percentage!\n\n"), arg);
         return STATE_UNKNOWN;
 }
 
-
-
-int
-validate_arguments ()
-{
+int validate_arguments() {
         float max_seconds;
         int i;
 
         if (wrta < 0.0) {
-                printf (_("<wrta> was not set\n"));
+                printf(_("<wrta> was not set\n"));
                 return ERROR;
-        }
-        else if (crta < 0.0) {
-                printf (_("<crta> was not set\n"));
+        } else if (crta < 0.0) {
+                printf(_("<crta> was not set\n"));
                 return ERROR;
-        }
-        else if (wpl == UNKNOWN_PACKET_LOSS) {
-                printf (_("<wpl> was not set\n"));
+        } else if (wpl == UNKNOWN_PACKET_LOSS) {
+                printf(_("<wpl> was not set\n"));
                 return ERROR;
-        }
-        else if (cpl == UNKNOWN_PACKET_LOSS) {
-                printf (_("<cpl> was not set\n"));
+        } else if (cpl == UNKNOWN_PACKET_LOSS) {
+                printf(_("<cpl> was not set\n"));
                 return ERROR;
-        }
-        else if (wrta > crta) {
-                printf (_("<wrta> (%f) cannot be larger than <crta> (%f)\n"), wrta, crta);
+        } else if (wrta > crta) {
+                printf(_("<wrta> (%f) cannot be larger than <crta> (%f)\n"), wrta, crta);
                 return ERROR;
-        }
-        else if (wpl > cpl) {
-                printf (_("<wpl> (%d) cannot be larger than <cpl> (%d)\n"), wpl, cpl);
+        } else if (wpl > cpl) {
+                printf(_("<wpl> (%d) cannot be larger than <cpl> (%d)\n"), wpl, cpl);
                 return ERROR;
         }
 
@@ -419,68 +388,61 @@ validate_arguments ()
         if (max_seconds > timeout_interval)
                 timeout_interval = (int)max_seconds;
 
-        for (i=0; i<n_addresses; i++) {
+        for (i = 0; i < n_addresses; i++) {
                 if (!is_host(addresses[i]))
-                        usage2 (_("Invalid hostname/address"), addresses[i]);
+                        usage2(_("Invalid hostname/address"), addresses[i]);
         }
 
         if (n_addresses == 0) {
-                usage (_("You must specify a server address or host name"));
+                usage(_("You must specify a server address or host name"));
         }
 
         return OK;
 }
 
-
-
-int
-run_ping (const char *cmd, const char *addr)
-{
+int run_ping(const char *cmd, const char *addr) {
         char buf[MAX_INPUT_BUFFER];
         int result = STATE_UNKNOWN;
         int match;
 
-        if ((child_process = spopen (cmd)) == NULL)
-                die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+        if ((child_process = spopen(cmd)) == NULL)
+                die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL)
-                printf (_("Cannot open stderr for %s\n"), cmd);
+                printf(_("Cannot open stderr for %s\n"), cmd);
 
-        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+        while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) {
 
                 if (verbose >= 3)
                         printf("Output: %s", buf);
 
-                result = max_state (result, error_scan (buf, addr));
+                result = max_state(result, error_scan(buf, addr));
 
                 /* get the percent loss statistics */
                 match = 0;
-                if((sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
-                         (sscanf(buf,"%*[^(](%d%% %*[^)])%n",&pl,&match) && match)
-                         )
+                if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) ||
+                        (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &pl, &match) && match))
                         continue;
 
                 /* get the round trip average */
-                else
-                        if((sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
-                                 (sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n",&rta,&match) && match) ||
-                                 (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match)
-                                 )
+                else if ((sscanf(buf, "round-trip min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n", &rta, &match) && match) ||
+                                 (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match))
                         continue;
         }
 
@@ -490,16 +452,14 @@ run_ping (const char *cmd, const char *addr)
 
         /* check stderr, setting at least WARNING if there is output here */
         /* Add warning into warn_text */
-        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                if (
-                        ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
-                        && ! strstr(buf,"Warning: time of day goes back")
+        while (fgets(buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                if (!strstr(buf, "WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP") && !strstr(buf, "Warning: time of day goes back")
 
                 ) {
                         if (verbose >= 3) {
                                 printf("Got stderr: %s", buf);
                         }
-                        if ((result=error_scan(buf, addr)) == STATE_OK) {
+                        if ((result = error_scan(buf, addr)) == STATE_OK) {
                                 result = STATE_WARNING;
                                 if (warn_text == NULL) {
                                         warn_text = strdup(_("System call sent warnings to stderr "));
@@ -510,10 +470,9 @@ run_ping (const char *cmd, const char *addr)
                 }
         }
 
-        (void) fclose (child_stderr);
-
+        (void)fclose(child_stderr);
 
-        spclose (child_process);
+        spclose(child_process);
 
         if (warn_text == NULL)
                 warn_text = strdup("");
@@ -521,100 +480,86 @@ run_ping (const char *cmd, const char *addr)
         return result;
 }
 
-
-
-int
-error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
-{
-        if (strstr (buf, "Network is unreachable") ||
-                strstr (buf, "Destination Net Unreachable") ||
-                strstr (buf, "No route")
-                )
-                die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr);
-        else if (strstr (buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable"))
-                die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr);
-        else if (strstr (buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable"))
-                die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr);
-        else if (strstr (buf, "Destination Protocol Unreachable"))
-                die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr);
-        else if (strstr (buf, "Destination Net Prohibited"))
-                die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);
-        else if (strstr (buf, "Destination Host Prohibited"))
-                die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr);
-        else if (strstr (buf, "Packet filtered") || strstr(buf, "Administratively prohibited"))
-                die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);
-        else if (strstr (buf, "unknown host" ))
-                die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), addr);
-        else if (strstr (buf, "Time to live exceeded") || strstr(buf, "Time exceeded"))
-                die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr);
-        else if (strstr (buf, "Destination unreachable: "))
-                die (STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr);
-
-        if (strstr (buf, "(DUP!)") || strstr (buf, "DUPLICATES FOUND")) {
+int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) {
+        if (strstr(buf, "Network is unreachable") || strstr(buf, "Destination Net Unreachable") || strstr(buf, "No route"))
+                die(STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr);
+        else if (strstr(buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable"))
+                die(STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr);
+        else if (strstr(buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable"))
+                die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr);
+        else if (strstr(buf, "Destination Protocol Unreachable"))
+                die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr);
+        else if (strstr(buf, "Destination Net Prohibited"))
+                die(STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);
+        else if (strstr(buf, "Destination Host Prohibited"))
+                die(STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr);
+        else if (strstr(buf, "Packet filtered") || strstr(buf, "Administratively prohibited"))
+                die(STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);
+        else if (strstr(buf, "unknown host"))
+                die(STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), addr);
+        else if (strstr(buf, "Time to live exceeded") || strstr(buf, "Time exceeded"))
+                die(STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr);
+        else if (strstr(buf, "Destination unreachable: "))
+                die(STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr);
+
+        if (strstr(buf, "(DUP!)") || strstr(buf, "DUPLICATES FOUND")) {
                 if (warn_text == NULL)
-                        warn_text = strdup (_(WARN_DUPLICATES));
-                else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
-                                xasprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
-                        die (STATE_UNKNOWN, _("Unable to realloc warn_text\n"));
+                        warn_text = strdup(_(WARN_DUPLICATES));
+                else if (!strstr(warn_text, _(WARN_DUPLICATES)) && xasprintf(&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
+                        die(STATE_UNKNOWN, _("Unable to realloc warn_text\n"));
                 return (STATE_WARNING);
         }
 
         return (STATE_OK);
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf (_("Use ping to check connection statistics for a remote host."));
+        printf(_("Use ping to check connection statistics for a remote host."));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_IPv46);
+        printf(UT_IPv46);
 
-        printf (" %s\n", "-H, --hostname=HOST");
-        printf ("    %s\n", _("host to ping"));
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("warning threshold pair"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("critical threshold pair"));
-        printf (" %s\n", "-p, --packets=INTEGER");
-        printf ("    %s ", _("number of ICMP ECHO packets to send"));
-        printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
-        printf (" %s\n", "-L, --link");
-        printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
+        printf(" %s\n", "-H, --hostname=HOST");
+        printf("    %s\n", _("host to ping"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("warning threshold pair"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("critical threshold pair"));
+        printf(" %s\n", "-p, --packets=INTEGER");
+        printf("    %s ", _("number of ICMP ECHO packets to send"));
+        printf(_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
+        printf(" %s\n", "-L, --link");
+        printf("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf ("\n");
-        printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
-        printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));
-        printf ("%s\n", _("percentage of packet loss to trigger an alarm state."));
+        printf("\n");
+        printf("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
+        printf("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));
+        printf("%s\n", _("percentage of packet loss to trigger an alarm state."));
 
-        printf ("\n");
-        printf ("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss"));
-        printf ("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output"));
-        printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
-        printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
+        printf("\n");
+        printf("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss"));
+        printf("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output"));
+        printf("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
+        printf("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
-        printf (" [-p packets] [-t timeout] [-4|-6]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
+        printf(" [-p packets] [-t timeout] [-4|-6]\n");
 }
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 1fcbd98..5777ba0 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -3,7 +3,7 @@
 * Monitoring check_procs plugin
 *
 * License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
+* Copyright (c) 2000-2024 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -36,7 +36,7 @@
 
 const char *progname = "check_procs";
 const char *program_name = "check_procs";  /* Required for coreutils libs */
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 6b32710..8ed19e5 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -3,7 +3,7 @@
 * Monitoring check_radius plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2008 Monitoring Plugins Development Team
+* Copyright (c) 1999-2024 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 *****************************************************************************/
 
 const char *progname = "check_radius";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 15e035b..369a88b 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-* 
-* Monitoring check_real plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_real plugin
-* 
-* This plugin tests the REAL service on the specified host.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_real plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_real plugin
+ *
+ * This plugin tests the REAL service on the specified host.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_real";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -37,121 +37,111 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 
 enum {
-        PORT    = 554
+        PORT = 554
 };
 
-#define EXPECT  "RTSP/1."
-#define URL     ""
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-int server_port = PORT;
-char *server_address;
-char *host_name;
-char *server_url = NULL;
-char *server_expect;
-int warning_time = 0;
-bool check_warning_time = false;
-int critical_time = 0;
-bool check_critical_time = false;
-bool verbose = false;
-
-
-
-int
-main (int argc, char **argv)
-{
-        int sd;
-        int result = STATE_UNKNOWN;
-        char buffer[MAX_INPUT_BUFFER];
-        char *status_line = NULL;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+#define EXPECT "RTSP/1."
+#define URL    ""
+
+static int process_arguments(int, char **);
+static void print_help(void);
+void print_usage(void);
+
+static int server_port = PORT;
+static char *server_address;
+static char *host_name;
+static char *server_url = NULL;
+static char *server_expect;
+static int warning_time = 0;
+static bool check_warning_time = false;
+static int critical_time = 0;
+static bool check_critical_time = false;
+static bool verbose = false;
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
-        time (&start_time);
+        alarm(socket_timeout);
+        time(&start_time);
 
         /* try to connect to the host at the given port number */
-        if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
-                die (STATE_CRITICAL, _("Unable to connect to %s on port %d\n"),
-                                                         server_address, server_port);
+        int socket;
+        if (my_tcp_connect(server_address, server_port, &socket) != STATE_OK)
+                die(STATE_CRITICAL, _("Unable to connect to %s on port %d\n"), server_address, server_port);
 
         /* Part I - Server Check */
 
         /* send the OPTIONS request */
-        sprintf (buffer, "OPTIONS rtsp://%s:%d RTSP/1.0\r\n", host_name, server_port);
-        result = send (sd, buffer, strlen (buffer), 0);
+        char buffer[MAX_INPUT_BUFFER];
+        sprintf(buffer, "OPTIONS rtsp://%s:%d RTSP/1.0\r\n", host_name, server_port);
+        int result = send(socket, buffer, strlen(buffer), 0);
 
         /* send the header sync */
-        sprintf (buffer, "CSeq: 1\r\n");
-        result = send (sd, buffer, strlen (buffer), 0);
+        sprintf(buffer, "CSeq: 1\r\n");
+        result = send(socket, buffer, strlen(buffer), 0);
 
         /* send a newline so the server knows we're done with the request */
-        sprintf (buffer, "\r\n");
-        result = send (sd, buffer, strlen (buffer), 0);
+        sprintf(buffer, "\r\n");
+        result = send(socket, buffer, strlen(buffer), 0);
 
         /* watch for the REAL connection string */
-        result = recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0);
+        result = recv(socket, buffer, MAX_INPUT_BUFFER - 1, 0);
 
         /* return a CRITICAL status if we couldn't read any data */
         if (result == -1)
-                die (STATE_CRITICAL, _("No data received from %s\n"), host_name);
+                die(STATE_CRITICAL, _("No data received from %s\n"), host_name);
 
+        char *status_line = NULL;
         /* make sure we find the response we are looking for */
-        if (!strstr (buffer, server_expect)) {
+        if (!strstr(buffer, server_expect)) {
                 if (server_port == PORT)
-                        printf ("%s\n", _("Invalid REAL response received from host"));
+                        printf("%s\n", _("Invalid REAL response received from host"));
                 else
-                        printf (_("Invalid REAL response received from host on port %d\n"),
-                                                        server_port);
-        }
-        else {
+                        printf(_("Invalid REAL response received from host on port %d\n"), server_port);
+        } else {
                 /* else we got the REAL string, so check the return code */
 
-                time (&end_time);
+                time(&end_time);
 
                 result = STATE_OK;
 
-                status_line = (char *) strtok (buffer, "\n");
+                status_line = (char *)strtok(buffer, "\n");
 
-                if (strstr (status_line, "200"))
+                if (strstr(status_line, "200"))
                         result = STATE_OK;
 
                 /* client errors result in a warning state */
-                else if (strstr (status_line, "400"))
+                else if (strstr(status_line, "400"))
                         result = STATE_WARNING;
-                else if (strstr (status_line, "401"))
+                else if (strstr(status_line, "401"))
                         result = STATE_WARNING;
-                else if (strstr (status_line, "402"))
+                else if (strstr(status_line, "402"))
                         result = STATE_WARNING;
-                else if (strstr (status_line, "403"))
+                else if (strstr(status_line, "403"))
                         result = STATE_WARNING;
-                else if (strstr (status_line, "404"))
+                else if (strstr(status_line, "404"))
                         result = STATE_WARNING;
 
                 /* server errors result in a critical state */
-                else if (strstr (status_line, "500"))
+                else if (strstr(status_line, "500"))
                         result = STATE_CRITICAL;
-                else if (strstr (status_line, "501"))
+                else if (strstr(status_line, "501"))
                         result = STATE_CRITICAL;
-                else if (strstr (status_line, "502"))
+                else if (strstr(status_line, "502"))
                         result = STATE_CRITICAL;
-                else if (strstr (status_line, "503"))
+                else if (strstr(status_line, "503"))
                         result = STATE_CRITICAL;
 
                 else
@@ -159,74 +149,70 @@ main (int argc, char **argv)
         }
 
         /* Part II - Check stream exists and is ok */
-        if ((result == STATE_OK )&& (server_url != NULL) ) {
+        if ((result == STATE_OK) && (server_url != NULL)) {
 
                 /* Part I - Server Check */
 
                 /* send the DESCRIBE request */
-                sprintf (buffer, "DESCRIBE rtsp://%s:%d%s RTSP/1.0\r\n", host_name,
-                                                 server_port, server_url);
-                result = send (sd, buffer, strlen (buffer), 0);
+                sprintf(buffer, "DESCRIBE rtsp://%s:%d%s RTSP/1.0\r\n", host_name, server_port, server_url);
+                result = send(socket, buffer, strlen(buffer), 0);
 
                 /* send the header sync */
-                sprintf (buffer, "CSeq: 2\r\n");
-                result = send (sd, buffer, strlen (buffer), 0);
+                sprintf(buffer, "CSeq: 2\r\n");
+                result = send(socket, buffer, strlen(buffer), 0);
 
                 /* send a newline so the server knows we're done with the request */
-                sprintf (buffer, "\r\n");
-                result = send (sd, buffer, strlen (buffer), 0);
+                sprintf(buffer, "\r\n");
+                result = send(socket, buffer, strlen(buffer), 0);
 
                 /* watch for the REAL connection string */
-                result = recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0);
+                result = recv(socket, buffer, MAX_INPUT_BUFFER - 1, 0);
                 buffer[result] = '\0'; /* null terminate received buffer */
 
                 /* return a CRITICAL status if we couldn't read any data */
                 if (result == -1) {
-                        printf (_("No data received from host\n"));
+                        printf(_("No data received from host\n"));
                         result = STATE_CRITICAL;
-                }
-                else {
+                } else {
                         /* make sure we find the response we are looking for */
-                        if (!strstr (buffer, server_expect)) {
+                        if (!strstr(buffer, server_expect)) {
                                 if (server_port == PORT)
-                                        printf ("%s\n", _("Invalid REAL response received from host"));
+                                        printf("%s\n", _("Invalid REAL response received from host"));
                                 else
-                                        printf (_("Invalid REAL response received from host on port %d\n"),
-                                                                        server_port);
-                        }
-                        else {
+                                        printf(_("Invalid REAL response received from host on port %d\n"), server_port);
+                        } else {
 
                                 /* else we got the REAL string, so check the return code */
 
-                                time (&end_time);
+                                time(&end_time);
 
                                 result = STATE_OK;
 
-                                status_line = (char *) strtok (buffer, "\n");
+                                status_line = (char *)strtok(buffer, "\n");
 
-                                if (strstr (status_line, "200"))
+                                if (strstr(status_line, "200"))
                                         result = STATE_OK;
 
                                 /* client errors result in a warning state */
-                                else if (strstr (status_line, "400"))
+                                else if (strstr(status_line, "400"))
                                         result = STATE_WARNING;
-                                else if (strstr (status_line, "401"))
+                                else if (strstr(status_line, "401"))
                                         result = STATE_WARNING;
-                                else if (strstr (status_line, "402"))
+                                else if (strstr(status_line, "402"))
                                         result = STATE_WARNING;
-                                else if (strstr (status_line, "403"))
+                                else if (strstr(status_line, "403"))
                                         result = STATE_WARNING;
-                                else if (strstr (status_line, "404"))
+                                else if (strstr(status_line, "404"))
                                         result = STATE_WARNING;
 
                                 /* server errors result in a critical state */
-                                else if (strstr (status_line, "500"))
+                                else if (strstr(status_line, "500"))
                                         result = STATE_CRITICAL;
-                                else if (strstr (status_line, "501"))
+                                else if (strstr(status_line, "501"))
                                         result = STATE_CRITICAL;
-                                else if (strstr (status_line, "502"))
+                                else if (strstr(status_line, "502"))
                                         result = STATE_CRITICAL;
-                                else if (strstr (status_line, "503"))
+                                else if (strstr(status_line, "503"))
                                         result = STATE_CRITICAL;
 
                                 else
@@ -238,217 +224,177 @@ main (int argc, char **argv)
         /* Return results */
         if (result == STATE_OK) {
 
-                if (check_critical_time
-                                && (end_time - start_time) > critical_time) result = STATE_CRITICAL;
-                else if (check_warning_time
-                                                 && (end_time - start_time) > warning_time) result =
-                                STATE_WARNING;
+                if (check_critical_time && (end_time - start_time) > critical_time)
+                        result = STATE_CRITICAL;
+                else if (check_warning_time && (end_time - start_time) > warning_time)
+                        result = STATE_WARNING;
 
                 /* Put some HTML in here to create a dynamic link */
-                printf (_("REAL %s - %d second response time\n"),
-                                                state_text (result),
-                                                (int) (end_time - start_time));
-        }
-        else
-                printf ("%s\n", status_line);
+                printf(_("REAL %s - %d second response time\n"), state_text(result), (int)(end_time - start_time));
+        } else
+                printf("%s\n", status_line);
 
         /* close the connection */
-        close (sd);
+        close(socket);
 
         /* reset the alarm */
-        alarm (0);
+        alarm(0);
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"IPaddress", required_argument, 0, 'I'},
-                {"expect", required_argument, 0, 'e'},
-                {"url", required_argument, 0, 'u'},
-                {"port", required_argument, 0, 'p'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"timeout", required_argument, 0, 't'},
-                {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'}, {"IPaddress", required_argument, 0, 'I'},
+                                                                           {"expect", required_argument, 0, 'e'},   {"url", required_argument, 0, 'u'},
+                                                                           {"port", required_argument, 0, 'p'},     {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},  {"timeout", required_argument, 0, 't'},
+                                                                           {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0)
+                        strcpy(argv[i], "-t");
+                else if (strcmp("-wt", argv[i]) == 0)
+                        strcpy(argv[i], "-w");
+                else if (strcmp("-ct", argv[i]) == 0)
+                        strcpy(argv[i], "-c");
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hvVI:H:e:u:p:w:c:t:", longopts,
-                                                                         &option);
+        int option_char;
+        while (true) {
+                int option = 0;
+                option_char = getopt_long(argc, argv, "+hvVI:H:e:u:p:w:c:t:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case 'I':                                                                       /* hostname */
-                case 'H':                                                                       /* hostname */
+                switch (option_char) {
+                case 'I': /* hostname */
+                case 'H': /* hostname */
                         if (server_address)
                                 break;
-                        else if (is_host (optarg))
+                        else if (is_host(optarg))
                                 server_address = optarg;
                         else
-                                usage2 (_("Invalid hostname/address"), optarg);
+                                usage2(_("Invalid hostname/address"), optarg);
                         break;
-                case 'e':                                                                       /* string to expect in response header */
+                case 'e': /* string to expect in response header */
                         server_expect = optarg;
                         break;
-                case 'u':                                                                       /* server URL */
+                case 'u': /* server URL */
                         server_url = optarg;
                         break;
-                case 'p':                                                                       /* port */
-                        if (is_intpos (optarg)) {
-                                server_port = atoi (optarg);
-                        }
-                        else {
-                                usage4 (_("Port must be a positive integer"));
+                case 'p': /* port */
+                        if (is_intpos(optarg)) {
+                                server_port = atoi(optarg);
+                        } else {
+                                usage4(_("Port must be a positive integer"));
                         }
                         break;
-                case 'w':                                                                       /* warning time threshold */
-                        if (is_intnonneg (optarg)) {
-                                warning_time = atoi (optarg);
+                case 'w': /* warning time threshold */
+                        if (is_intnonneg(optarg)) {
+                                warning_time = atoi(optarg);
                                 check_warning_time = true;
-                        }
-                        else {
-                                usage4 (_("Warning time must be a positive integer"));
+                        } else {
+                                usage4(_("Warning time must be a positive integer"));
                         }
                         break;
-                case 'c':                                                                       /* critical time threshold */
-                        if (is_intnonneg (optarg)) {
-                                critical_time = atoi (optarg);
+                case 'c': /* critical time threshold */
+                        if (is_intnonneg(optarg)) {
+                                critical_time = atoi(optarg);
                                 check_critical_time = true;
-                        }
-                        else {
-                                usage4 (_("Critical time must be a positive integer"));
+                        } else {
+                                usage4(_("Critical time must be a positive integer"));
                         }
                         break;
-                case 'v':                                                                       /* verbose */
+                case 'v': /* verbose */
                         verbose = true;
                         break;
-                case 't':                                                                       /* timeout */
-                        if (is_intnonneg (optarg)) {
-                                socket_timeout = atoi (optarg);
-                        }
-                        else {
-                                usage4 (_("Timeout interval must be a positive integer"));
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                socket_timeout = atoi(optarg);
+                        } else {
+                                usage4(_("Timeout interval must be a positive integer"));
                         }
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* usage */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* usage */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (server_address==NULL && argc>c) {
-                if (is_host (argv[c])) {
-                        server_address = argv[c++];
-                }
-                else {
-                        usage2 (_("Invalid hostname/address"), argv[c]);
+        option_char = optind;
+        if (server_address == NULL && argc > option_char) {
+                if (is_host(argv[option_char])) {
+                        server_address = argv[option_char++];
+                } else {
+                        usage2(_("Invalid hostname/address"), argv[option_char]);
                 }
         }
 
-        if (server_address==NULL)
-                usage4 (_("You must provide a server to check"));
+        if (server_address == NULL)
+                usage4(_("You must provide a server to check"));
 
-        if (host_name==NULL)
-                host_name = strdup (server_address);
+        if (host_name == NULL)
+                host_name = strdup(server_address);
 
         if (server_expect == NULL)
                 server_expect = strdup(EXPECT);
 
-        return validate_arguments ();
-}
-
-
-
-int
-validate_arguments (void)
-{
         return OK;
 }
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", PORT);
+        xasprintf(&myport, "%d", PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin tests the REAL service on the specified host."));
+        printf("%s\n", _("This plugin tests the REAL service on the specified host."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (" %s\n", "-u, --url=STRING");
-  printf ("    %s\n", _("Connect to this url"));
-  printf (" %s\n", "-e, --expect=STRING");
-  printf (_("String to expect in first line of server response (default: %s)\n"),
-               EXPECT);
+        printf(" %s\n", "-u, --url=STRING");
+        printf("    %s\n", _("Connect to this url"));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf(_("String to expect in first line of server response (default: %s)\n"), EXPECT);
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-  printf ("\n");
-        printf ("%s\n", _("This plugin will attempt to open an RTSP connection with the host."));
-  printf ("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
-  printf ("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,"));
-  printf ("%s\n", _("but incorrect response messages from the host result in STATE_WARNING return"));
-  printf ("%s\n", _("values."));
+        printf("\n");
+        printf("%s\n", _("This plugin will attempt to open an RTSP connection with the host."));
+        printf("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
+        printf("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,"));
+        printf("%s\n", _("but incorrect response messages from the host result in STATE_WARNING return"));
+        printf("%s\n", _("values."));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v]\n", progname);
 }
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 986c3e1..bc17528 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -3,7 +3,7 @@
 * Monitoring check_smtp plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2023 Monitoring Plugins Development Team
+* Copyright (c) 2000-2024 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 *****************************************************************************/
 
 const char *progname = "check_smtp";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 90a0402..c1d8e2d 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-*
-* Monitoring check_snmp plugin
-*
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_snmp plugin
-*
-* Check status of remote machines and obtain system information via SNMP
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_snmp plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_snmp plugin
+ *
+ * Check status of remote machines and obtain system information via SNMP
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_snmp";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -37,60 +37,68 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 #include "utils_cmd.h"
 
-#define DEFAULT_COMMUNITY "public"
-#define DEFAULT_PORT "161"
-#define DEFAULT_MIBLIST "ALL"
-#define DEFAULT_PROTOCOL "1"
-#define DEFAULT_RETRIES 5
-#define DEFAULT_AUTH_PROTOCOL "MD5"
-#define DEFAULT_PRIV_PROTOCOL "DES"
-#define DEFAULT_DELIMITER "="
+#define DEFAULT_COMMUNITY        "public"
+#define DEFAULT_PORT             "161"
+#define DEFAULT_MIBLIST          "ALL"
+#define DEFAULT_PROTOCOL         "1"
+#define DEFAULT_RETRIES          5
+#define DEFAULT_AUTH_PROTOCOL    "MD5"
+#define DEFAULT_PRIV_PROTOCOL    "DES"
+#define DEFAULT_DELIMITER        "="
 #define DEFAULT_OUTPUT_DELIMITER " "
-#define DEFAULT_BUFFER_SIZE 100
+#define DEFAULT_BUFFER_SIZE      100
 
-#define mark(a) ((a)!=0?"*":"")
+#define mark(a) ((a) != 0 ? "*" : "")
 
-#define CHECK_UNDEF 0
+#define CHECK_UNDEF  0
 #define CRIT_PRESENT 1
-#define CRIT_STRING 2
-#define CRIT_REGEX 4
+#define CRIT_STRING  2
+#define CRIT_REGEX   4
 #define WARN_PRESENT 8
 
 #define OID_COUNT_STEP 8
 
 /* Longopts only arguments */
-#define L_CALCULATE_RATE CHAR_MAX+1
-#define L_RATE_MULTIPLIER CHAR_MAX+2
-#define L_INVERT_SEARCH CHAR_MAX+3
-#define L_OFFSET CHAR_MAX+4
-#define L_IGNORE_MIB_PARSING_ERRORS CHAR_MAX+5
+#define L_CALCULATE_RATE            CHAR_MAX + 1
+#define L_RATE_MULTIPLIER           CHAR_MAX + 2
+#define L_INVERT_SEARCH             CHAR_MAX + 3
+#define L_OFFSET                    CHAR_MAX + 4
+#define L_IGNORE_MIB_PARSING_ERRORS CHAR_MAX + 5
 
 /* Gobble to string - stop incrementing c when c[0] match one of the
  * characters in s */
-#define GOBBLE_TOS(c, s) while(c[0]!='\0' && strchr(s, c[0])==NULL) { c++; }
+#define GOBBLE_TOS(c, s)                                                                                                                   \
+        while (c[0] != '\0' && strchr(s, c[0]) == NULL) {                                                                                      \
+                c++;                                                                                                                               \
+        }
 /* Given c, keep track of backslashes (bk) and double-quotes (dq)
  * from c[0] */
-#define COUNT_SEQ(c, bk, dq) switch(c[0]) {\
-        case '\\': \
-                if (bk) bk--; \
-                else bk++; \
-                break; \
-        case '"': \
-                if (!dq) { dq++; } \
-                else if(!bk) { dq--; } \
-                else { bk--; } \
-                break; \
+#define COUNT_SEQ(c, bk, dq)                                                                                                               \
+        switch (c[0]) {                                                                                                                        \
+        case '\\':                                                                                                                             \
+                if (bk)                                                                                                                            \
+                        bk--;                                                                                                                          \
+                else                                                                                                                               \
+                        bk++;                                                                                                                          \
+                break;                                                                                                                             \
+        case '"':                                                                                                                              \
+                if (!dq) {                                                                                                                         \
+                        dq++;                                                                                                                          \
+                } else if (!bk) {                                                                                                                  \
+                        dq--;                                                                                                                          \
+                } else {                                                                                                                           \
+                        bk--;                                                                                                                          \
+                }                                                                                                                                  \
+                break;                                                                                                                             \
         }
 
-
-
-static int process_arguments (int, char **);
-static int validate_arguments (void);
-static char *thisarg (char *str);
-static char *nextarg (char *str);
-void print_usage (void);
-static void print_help (void);
-static char *multiply (char *str);
+static int process_arguments(int, char **);
+static int validate_arguments(void);
+static char *thisarg(char *str);
+static char *nextarg(char *str);
+void print_usage(void);
+static void print_help(void);
+static char *multiply(char *str);
 
 #include "regex.h"
 static char regex_expect[MAX_INPUT_BUFFER] = "";
@@ -122,7 +130,7 @@ static char *units;
 static char *port;
 static char *snmpcmd;
 static char string_value[MAX_INPUT_BUFFER] = "";
-static int  invert_search=0;
+static int invert_search = 0;
 static char **labels = NULL;
 static char **unitv = NULL;
 static size_t nlabels = 0;
@@ -154,17 +162,18 @@ static state_data *previous_state;
 static double *previous_value;
 static size_t previous_size = OID_COUNT_STEP;
 static int perf_labels = 1;
-static char* ip_version = "";
+static char *ip_version = "";
 static double multiplier = 1.0;
 static char *fmtstr = "";
 static bool fmtstr_set = false;
 static char buffer[DEFAULT_BUFFER_SIZE];
 static bool ignore_mib_parsing_errors = false;
 
-static char *fix_snmp_range(char *th)
-{
-        double left, right;
-        char *colon, *ret;
+static char *fix_snmp_range(char *th) {
+        double left;
+        double right;
+        char *colon;
+        char *ret;
 
         if ((colon = strchr(th, ':')) == NULL || *(colon + 1) == '\0')
                 return th;
@@ -182,12 +191,12 @@ static char *fix_snmp_range(char *th)
         return ret;
 }
 
-int
-main (int argc, char **argv)
-{
-        int len, total_oids;
+int main(int argc, char **argv) {
+        int len;
+        int total_oids;
         size_t line;
-        unsigned int bk_count = 0, dq_count = 0;
+        unsigned int bk_count = 0;
+        unsigned int dq_count = 0;
         int iresult = STATE_UNKNOWN;
         int result = STATE_UNKNOWN;
         int return_code = 0;
@@ -200,80 +209,83 @@ main (int argc, char **argv)
         char *outbuff;
         char *ptr = NULL;
         char *show = NULL;
-        char *th_warn=NULL;
-        char *th_crit=NULL;
+        char *th_warn = NULL;
+        char *th_crit = NULL;
         char type[8] = "";
-        output chld_out, chld_err;
-        char *previous_string=NULL;
-        char *ap=NULL;
-        char *state_string=NULL;
-        size_t response_length, current_length, string_length;
-        char *temp_string=NULL;
-        char *quote_string=NULL;
+        output chld_out;
+        output chld_err;
+        char *previous_string = NULL;
+        char *ap = NULL;
+        char *state_string = NULL;
+        size_t response_length;
+        size_t current_length;
+        size_t string_length;
+        char *temp_string = NULL;
+        char *quote_string = NULL;
         time_t current_time;
         double temp_double;
         time_t duration;
         char *conv = "12345678";
-        int is_counter=0;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
-
-        labels = malloc (labels_size * sizeof(*labels));
-        unitv = malloc (unitv_size * sizeof(*unitv));
-        thlds = malloc (thlds_size * sizeof(*thlds));
-        response_value = malloc (response_size * sizeof(*response_value));
-        previous_value = malloc (previous_size * sizeof(*previous_value));
-        eval_method = calloc (eval_size, sizeof(*eval_method));
-        oids = calloc(oids_size, sizeof (char *));
-
-        label = strdup ("SNMP");
-        units = strdup ("");
-        port = strdup (DEFAULT_PORT);
-        outbuff = strdup ("");
-        delimiter = strdup (" = ");
-        output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
+        int is_counter = 0;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        labels = malloc(labels_size * sizeof(*labels));
+        unitv = malloc(unitv_size * sizeof(*unitv));
+        thlds = malloc(thlds_size * sizeof(*thlds));
+        response_value = malloc(response_size * sizeof(*response_value));
+        previous_value = malloc(previous_size * sizeof(*previous_value));
+        eval_method = calloc(eval_size, sizeof(*eval_method));
+        oids = calloc(oids_size, sizeof(char *));
+
+        label = strdup("SNMP");
+        units = strdup("");
+        port = strdup(DEFAULT_PORT);
+        outbuff = strdup("");
+        delimiter = strdup(" = ");
+        output_delim = strdup(DEFAULT_OUTPUT_DELIMITER);
         timeout_interval = DEFAULT_SOCKET_TIMEOUT;
         retries = DEFAULT_RETRIES;
 
-        np_init( (char *) progname, argc, argv );
+        np_init((char *)progname, argc, argv);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
         np_set_args(argc, argv);
 
         time(&current_time);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
-        if(calculate_rate) {
+        if (calculate_rate) {
                 if (!strcmp(label, "SNMP"))
                         label = strdup("SNMP RATE");
 
                 size_t i = 0;
 
                 previous_state = np_state_read();
-                if(previous_state!=NULL) {
+                if (previous_state != NULL) {
                         /* Split colon separated values */
-                        previous_string = strdup((char *) previous_state->data);
-                        while((ap = strsep(&previous_string, ":")) != NULL) {
-                                if(verbose>2)
+                        previous_string = strdup((char *)previous_state->data);
+                        while ((ap = strsep(&previous_string, ":")) != NULL) {
+                                if (verbose > 2)
                                         printf("State for %zd=%s\n", i, ap);
                                 while (i >= previous_size) {
                                         previous_size += OID_COUNT_STEP;
                                         previous_value = realloc(previous_value, previous_size * sizeof(*previous_value));
                                 }
-                                previous_value[i++]=strtod(ap,NULL);
+                                previous_value[i++] = strtod(ap, NULL);
                         }
                 }
         }
 
         /* Populate the thresholds */
-        th_warn=warning_thresholds;
-        th_crit=critical_thresholds;
+        th_warn = warning_thresholds;
+        th_crit = critical_thresholds;
         for (size_t i = 0; i < numoids; i++) {
                 char *w = th_warn ? strndup(th_warn, strcspn(th_warn, ",")) : NULL;
                 char *c = th_crit ? strndup(th_crit, strcspn(th_crit, ",")) : NULL;
@@ -287,53 +299,52 @@ main (int argc, char **argv)
                 }
 
                 /* Skip empty thresholds, while avoiding segfault */
-                set_thresholds(&thlds[i],
-                               w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL,
-                               c ? strpbrk(c, NP_THRESHOLDS_CHARS) : NULL);
+                set_thresholds(&thlds[i], w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL, c ? strpbrk(c, NP_THRESHOLDS_CHARS) : NULL);
                 if (w) {
-                        th_warn=strchr(th_warn, ',');
-                        if (th_warn) th_warn++;
+                        th_warn = strchr(th_warn, ',');
+                        if (th_warn)
+                                th_warn++;
                         free(w);
                 }
                 if (c) {
-                        th_crit=strchr(th_crit, ',');
-                        if (th_crit) th_crit++;
+                        th_crit = strchr(th_crit, ',');
+                        if (th_crit)
+                                th_crit++;
                         free(c);
                 }
         }
 
         /* Create the command array to execute */
-        if(usesnmpgetnext) {
-                snmpcmd = strdup (PATH_TO_SNMPGETNEXT);
-        }else{
-                snmpcmd = strdup (PATH_TO_SNMPGET);
+        if (usesnmpgetnext) {
+                snmpcmd = strdup(PATH_TO_SNMPGETNEXT);
+        } else {
+                snmpcmd = strdup(PATH_TO_SNMPGET);
         }
 
         /* 10 arguments to pass before context and authpriv options + 1 for host and numoids. Add one for terminating NULL */
 
         unsigned index = 0;
-        command_line = calloc (11 + numcontext + numauthpriv + 1 + numoids + 1, sizeof (char *));
+        command_line = calloc(11 + numcontext + numauthpriv + 1 + numoids + 1, sizeof(char *));
 
         command_line[index++] = snmpcmd;
-        command_line[index++] = strdup ("-Le");
-        command_line[index++] = strdup ("-t");
-        xasprintf (&command_line[index++], "%d", timeout_interval);
-        command_line[index++] = strdup ("-r");
-        xasprintf (&command_line[index++], "%d", retries);
-        command_line[index++] = strdup ("-m");
-        command_line[index++] = strdup (miblist);
+        command_line[index++] = strdup("-Le");
+        command_line[index++] = strdup("-t");
+        xasprintf(&command_line[index++], "%d", timeout_interval);
+        command_line[index++] = strdup("-r");
+        xasprintf(&command_line[index++], "%d", retries);
+        command_line[index++] = strdup("-m");
+        command_line[index++] = strdup(miblist);
         command_line[index++] = "-v";
-        command_line[index++] = strdup (proto);
+        command_line[index++] = strdup(proto);
 
-        xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s",
-                snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto);
+        xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s", snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''",
+                          proto);
 
         if (ignore_mib_parsing_errors) {
                 command_line[index++] = "-Pe";
                 xasprintf(&cl_hidden_auth, "%s -Pe", cl_hidden_auth);
         }
 
-
         for (int i = 0; i < numcontext; i++) {
                 command_line[index++] = contextargs[i];
         }
@@ -342,12 +353,9 @@ main (int argc, char **argv)
                 command_line[index++] = authpriv[i];
         }
 
-        xasprintf (&command_line[index++], "%s:%s", server_address, port);
+        xasprintf(&command_line[index++], "%s:%s", server_address, port);
 
-        xasprintf(&cl_hidden_auth, "%s [context] [authpriv] %s:%s",
-         cl_hidden_auth,
-         server_address,
-         port);
+        xasprintf(&cl_hidden_auth, "%s [context] [authpriv] %s:%s", cl_hidden_auth, server_address, port);
 
         for (size_t i = 0; i < numoids; i++) {
                 command_line[index++] = oids[i];
@@ -357,17 +365,17 @@ main (int argc, char **argv)
         command_line[index++] = NULL;
 
         if (verbose) {
-                printf ("%s\n", cl_hidden_auth);
+                printf("%s\n", cl_hidden_auth);
         }
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
         alarm(timeout_interval * retries + 5);
 
         /* Run the command */
-        return_code = cmd_run_array (command_line, &chld_out, &chld_err, 0);
+        return_code = cmd_run_array(command_line, &chld_out, &chld_err, 0);
 
         /* disable alarm again */
         alarm(0);
@@ -377,80 +385,74 @@ main (int argc, char **argv)
            Do this way so that if there is stderr, will get added to output, which helps problem diagnosis
         */
         if (return_code != 0)
-                external_error=1;
+                external_error = 1;
         if (chld_out.lines == 0)
-                external_error=1;
+                external_error = 1;
         if (external_error) {
                 if (chld_err.lines > 0) {
-                        printf (_("External command error: %s\n"), chld_err.line[0]);
+                        printf(_("External command error: %s\n"), chld_err.line[0]);
                         for (size_t i = 1; i < chld_err.lines; i++) {
-                                printf ("%s\n", chld_err.line[i]);
+                                printf("%s\n", chld_err.line[i]);
                         }
                 } else {
                         printf(_("External command error with no output (return code: %d)\n"), return_code);
                 }
-                exit (STATE_UNKNOWN);
+                exit(STATE_UNKNOWN);
         }
 
         if (verbose) {
                 for (size_t i = 0; i < chld_out.lines; i++) {
-                        printf ("%s\n", chld_out.line[i]);
+                        printf("%s\n", chld_out.line[i]);
                 }
         }
 
         line = 0;
         total_oids = 0;
-        for (size_t i = 0; line < chld_out.lines && i < numoids ; line++, i++, total_oids++) {
-                if(calculate_rate)
+        for (size_t i = 0; line < chld_out.lines && i < numoids; line++, i++, total_oids++) {
+                if (calculate_rate)
                         conv = "%.10g";
                 else
                         conv = "%.0f";
 
                 ptr = chld_out.line[line];
-                oidname = strpcpy (oidname, ptr, delimiter);
-                response = strstr (ptr, delimiter);
+                oidname = strpcpy(oidname, ptr, delimiter);
+                response = strstr(ptr, delimiter);
                 if (response == NULL)
                         break;
 
                 if (verbose > 2) {
-                        printf("Processing oid %zi (line %zi)\n  oidname: %s\n  response: %s\n", i+1, line+1, oidname, response);
+                        printf("Processing oid %zi (line %zi)\n  oidname: %s\n  response: %s\n", i + 1, line + 1, oidname, response);
                 }
 
                 /* Clean up type array - Sol10 does not necessarily zero it out */
                 bzero(type, sizeof(type));
 
-                is_counter=0;
+                is_counter = 0;
                 /* We strip out the datatype indicator for PHBs */
-                if (strstr (response, "Gauge: ")) {
-                        show = multiply (strstr (response, "Gauge: ") + 7);
-                }
-                else if (strstr (response, "Gauge32: ")) {
-                        show = multiply (strstr (response, "Gauge32: ") + 9);
-                }
-                else if (strstr (response, "Counter32: ")) {
-                        show = strstr (response, "Counter32: ") + 11;
-                        is_counter=1;
-                        if(!calculate_rate)
+                if (strstr(response, "Gauge: ")) {
+                        show = multiply(strstr(response, "Gauge: ") + 7);
+                } else if (strstr(response, "Gauge32: ")) {
+                        show = multiply(strstr(response, "Gauge32: ") + 9);
+                } else if (strstr(response, "Counter32: ")) {
+                        show = strstr(response, "Counter32: ") + 11;
+                        is_counter = 1;
+                        if (!calculate_rate)
                                 strcpy(type, "c");
-                }
-                else if (strstr (response, "Counter64: ")) {
-                        show = strstr (response, "Counter64: ") + 11;
-                        is_counter=1;
-                        if(!calculate_rate)
+                } else if (strstr(response, "Counter64: ")) {
+                        show = strstr(response, "Counter64: ") + 11;
+                        is_counter = 1;
+                        if (!calculate_rate)
                                 strcpy(type, "c");
-                }
-                else if (strstr (response, "INTEGER: ")) {
-                        show = multiply (strstr (response, "INTEGER: ") + 9);
+                } else if (strstr(response, "INTEGER: ")) {
+                        show = multiply(strstr(response, "INTEGER: ") + 9);
 
                         if (fmtstr_set) {
                                 conv = fmtstr;
                         }
-                }
-                else if (strstr (response, "OID: ")) {
-                        show = strstr (response, "OID: ") + 5;
-                }
-                else if (strstr (response, "STRING: ")) {
-                        show = strstr (response, "STRING: ") + 8;
+                } else if (strstr(response, "OID: ")) {
+                        show = strstr(response, "OID: ") + 5;
+                } else if (strstr(response, "STRING: ")) {
+                        show = strstr(response, "STRING: ") + 8;
                         conv = "%.10g";
 
                         /* Get the rest of the string on multi-line strings */
@@ -464,15 +466,17 @@ main (int argc, char **argv)
 
                         if (dq_count) { /* unfinished line */
                                 /* copy show verbatim first */
-                                if (!mult_resp) mult_resp = strdup("");
-                                xasprintf (&mult_resp, "%s%s:\n%s\n", mult_resp, oids[i], show);
+                                if (!mult_resp)
+                                        mult_resp = strdup("");
+                                xasprintf(&mult_resp, "%s%s:\n%s\n", mult_resp, oids[i], show);
                                 /* then strip out unmatched double-quote from single-line output */
-                                if (show[0] == '"') show++;
+                                if (show[0] == '"')
+                                        show++;
 
                                 /* Keep reading until we match end of double-quoted string */
                                 for (line++; line < chld_out.lines; line++) {
                                         ptr = chld_out.line[line];
-                                        xasprintf (&mult_resp, "%s%s\n", mult_resp, ptr);
+                                        xasprintf(&mult_resp, "%s%s\n", mult_resp, ptr);
 
                                         COUNT_SEQ(ptr, bk_count, dq_count)
                                         while (dq_count && ptr[0] != '\n' && ptr[0] != '\0') {
@@ -481,15 +485,14 @@ main (int argc, char **argv)
                                                 COUNT_SEQ(ptr, bk_count, dq_count)
                                         }
                                         /* Break for loop before next line increment when done */
-                                        if (!dq_count) break;
+                                        if (!dq_count)
+                                                break;
                                 }
                         }
 
-                }
-                else if (strstr (response, "Timeticks: ")) {
-                        show = strstr (response, "Timeticks: ");
-                }
-                else
+                } else if (strstr(response, "Timeticks: ")) {
+                        show = strstr(response, "Timeticks: ");
+                } else
                         show = response + 3;
 
                 iresult = STATE_DEPENDENT;
@@ -500,68 +503,67 @@ main (int argc, char **argv)
                         if (verbose > 2) {
                                 print_thresholds("  thresholds", thlds[i]);
                         }
-                        ptr = strpbrk (show, "-0123456789");
-                        if (ptr == NULL){
+                        ptr = strpbrk(show, "-0123456789");
+                        if (ptr == NULL) {
                                 if (nulloid == 3)
-                                        die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_UNKNOWN, _("No valid data returned (%s)\n"), show);
                                 else if (nulloid == 0)
-                                        die (STATE_OK,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_OK, _("No valid data returned (%s)\n"), show);
                                 else if (nulloid == 1)
-                                        die (STATE_WARNING,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_WARNING, _("No valid data returned (%s)\n"), show);
                                 else if (nulloid == 2)
-                                        die (STATE_CRITICAL,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_CRITICAL, _("No valid data returned (%s)\n"), show);
                         }
                         while (i >= response_size) {
                                 response_size += OID_COUNT_STEP;
                                 response_value = realloc(response_value, response_size * sizeof(*response_value));
                         }
-                        response_value[i] = strtod (ptr, NULL) + offset;
-
-                        if(calculate_rate) {
-                                if (previous_state!=NULL) {
-                                        duration = current_time-previous_state->time;
-                                        if(duration<=0)
-                                                die(STATE_UNKNOWN,_("Time duration between plugin calls is invalid"));
-                                        temp_double = response_value[i]-previous_value[i];
+                        response_value[i] = strtod(ptr, NULL) + offset;
+
+                        if (calculate_rate) {
+                                if (previous_state != NULL) {
+                                        duration = current_time - previous_state->time;
+                                        if (duration <= 0)
+                                                die(STATE_UNKNOWN, _("Time duration between plugin calls is invalid"));
+                                        temp_double = response_value[i] - previous_value[i];
                                         /* Simple overflow catcher (same as in rrdtool, rrd_update.c) */
-                                        if(is_counter) {
-                                                if(temp_double<(double)0.0)
-                                                        temp_double+=(double)4294967296.0; /* 2^32 */
-                                                if(temp_double<(double)0.0)
-                                                        temp_double+=(double)18446744069414584320.0; /* 2^64-2^32 */;
+                                        if (is_counter) {
+                                                if (temp_double < (double)0.0)
+                                                        temp_double += (double)4294967296.0; /* 2^32 */
+                                                if (temp_double < (double)0.0)
+                                                        temp_double += (double)18446744069414584320.0; /* 2^64-2^32 */
+                                                ;
                                         }
                                         /* Convert to per second, then use multiplier */
-                                        temp_double = temp_double/duration*rate_multiplier;
+                                        temp_double = temp_double / duration * rate_multiplier;
                                         iresult = get_status(temp_double, thlds[i]);
-                                        xasprintf (&show, conv, temp_double);
+                                        xasprintf(&show, conv, temp_double);
                                 }
                         } else {
                                 iresult = get_status(response_value[i], thlds[i]);
-                                xasprintf (&show, conv, response_value[i]);
+                                xasprintf(&show, conv, response_value[i]);
                         }
                 }
 
                 /* Process this block for string matching */
                 else if (eval_size > i && eval_method[i] & CRIT_STRING) {
-                        if (strcmp (show, string_value))
-                                iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
+                        if (strcmp(show, string_value))
+                                iresult = (invert_search == 0) ? STATE_CRITICAL : STATE_OK;
                         else
-                                iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
+                                iresult = (invert_search == 0) ? STATE_OK : STATE_CRITICAL;
                 }
 
                 /* Process this block for regex matching */
                 else if (eval_size > i && eval_method[i] & CRIT_REGEX) {
-                        excode = regexec (&preg, response, 10, pmatch, eflags);
+                        excode = regexec(&preg, response, 10, pmatch, eflags);
                         if (excode == 0) {
-                                iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
-                        }
-                        else if (excode != REG_NOMATCH) {
-                                regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                printf (_("Execute Error: %s\n"), errbuf);
-                                exit (STATE_CRITICAL);
-                        }
-                        else {
-                                iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
+                                iresult = (invert_search == 0) ? STATE_OK : STATE_CRITICAL;
+                        } else if (excode != REG_NOMATCH) {
+                                regerror(excode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Execute Error: %s\n"), errbuf);
+                                exit(STATE_CRITICAL);
+                        } else {
+                                iresult = (invert_search == 0) ? STATE_CRITICAL : STATE_OK;
                         }
                 }
 
@@ -577,294 +579,283 @@ main (int argc, char **argv)
                 }
 
                 /* Result is the worst outcome of all the OIDs tested */
-                result = max_state (result, iresult);
+                result = max_state(result, iresult);
 
                 /* Prepend a label for this OID if there is one */
                 if (nlabels >= (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
-                        xasprintf (&outbuff, "%s%s%s %s%s%s", outbuff,
-                                (i == 0) ? " " : output_delim,
-                                labels[i], mark (iresult), show, mark (iresult));
+                        xasprintf(&outbuff, "%s%s%s %s%s%s", outbuff, (i == 0) ? " " : output_delim, labels[i], mark(iresult), show, mark(iresult));
                 else
-                        xasprintf (&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim,
-                                mark (iresult), show, mark (iresult));
+                        xasprintf(&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim, mark(iresult), show, mark(iresult));
 
                 /* Append a unit string for this OID if there is one */
                 if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
-                        xasprintf (&outbuff, "%s %s", outbuff, unitv[i]);
+                        xasprintf(&outbuff, "%s %s", outbuff, unitv[i]);
 
                 /* Write perfdata with whatever can be parsed by strtod, if possible */
                 ptr = NULL;
                 strtod(show, &ptr);
                 if (ptr > show) {
                         if (perf_labels && nlabels >= (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
-                                temp_string=labels[i];
+                                temp_string = labels[i];
                         else
-                                temp_string=oidname;
-                        if (strpbrk (temp_string, " ='\"") == NULL) {
-                                strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
+                                temp_string = oidname;
+                        if (strpbrk(temp_string, " ='\"") == NULL) {
+                                strncat(perfstr, temp_string, sizeof(perfstr) - strlen(perfstr) - 1);
                         } else {
-                                if (strpbrk (temp_string, "'") == NULL) {
-                                        quote_string="'";
+                                if (strpbrk(temp_string, "'") == NULL) {
+                                        quote_string = "'";
                                 } else {
-                                        quote_string="\"";
+                                        quote_string = "\"";
                                 }
-                                strncat(perfstr, quote_string, sizeof(perfstr)-strlen(perfstr)-1);
-                                strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
-                                strncat(perfstr, quote_string, sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, quote_string, sizeof(perfstr) - strlen(perfstr) - 1);
+                                strncat(perfstr, temp_string, sizeof(perfstr) - strlen(perfstr) - 1);
+                                strncat(perfstr, quote_string, sizeof(perfstr) - strlen(perfstr) - 1);
                         }
-                        strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
-                        len = sizeof(perfstr)-strlen(perfstr)-1;
-                        strncat(perfstr, show, len>ptr-show ? ptr-show : len);
+                        strncat(perfstr, "=", sizeof(perfstr) - strlen(perfstr) - 1);
+                        len = sizeof(perfstr) - strlen(perfstr) - 1;
+                        strncat(perfstr, show, len > ptr - show ? ptr - show : len);
 
                         if (strcmp(type, "") != 0) {
-                                strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, type, sizeof(perfstr) - strlen(perfstr) - 1);
                         }
 
                         if (warning_thresholds) {
-                                strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
-                                if(thlds[i]->warning && thlds[i]->warning->text)
-                                        strncat(perfstr, thlds[i]->warning->text, sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, ";", sizeof(perfstr) - strlen(perfstr) - 1);
+                                if (thlds[i]->warning && thlds[i]->warning->text)
+                                        strncat(perfstr, thlds[i]->warning->text, sizeof(perfstr) - strlen(perfstr) - 1);
                         }
 
                         if (critical_thresholds) {
                                 if (!warning_thresholds)
-                                        strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
-                                strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
-                                if(thlds[i]->critical && thlds[i]->critical->text)
-                                        strncat(perfstr, thlds[i]->critical->text, sizeof(perfstr)-strlen(perfstr)-1);
+                                        strncat(perfstr, ";", sizeof(perfstr) - strlen(perfstr) - 1);
+                                strncat(perfstr, ";", sizeof(perfstr) - strlen(perfstr) - 1);
+                                if (thlds[i]->critical && thlds[i]->critical->text)
+                                        strncat(perfstr, thlds[i]->critical->text, sizeof(perfstr) - strlen(perfstr) - 1);
                         }
 
-                        strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
+                        strncat(perfstr, " ", sizeof(perfstr) - strlen(perfstr) - 1);
                 }
         }
 
         /* Save state data, as all data collected now */
-        if(calculate_rate) {
-                string_length=1024;
-                state_string=malloc(string_length);
-                if(state_string==NULL)
+        if (calculate_rate) {
+                string_length = 1024;
+                state_string = malloc(string_length);
+                if (state_string == NULL)
                         die(STATE_UNKNOWN, _("Cannot malloc"));
 
-                current_length=0;
-                for(int i = 0; i < total_oids; i++) {
-                        xasprintf(&temp_string,"%.0f",response_value[i]);
-                        if(temp_string==NULL)
-                                die(STATE_UNKNOWN,_("Cannot asprintf()"));
+                current_length = 0;
+                for (int i = 0; i < total_oids; i++) {
+                        xasprintf(&temp_string, "%.0f", response_value[i]);
+                        if (temp_string == NULL)
+                                die(STATE_UNKNOWN, _("Cannot asprintf()"));
                         response_length = strlen(temp_string);
-                        if(current_length+response_length>string_length) {
-                                string_length=current_length+1024;
-                                state_string=realloc(state_string,string_length);
-                                if(state_string==NULL)
+                        if (current_length + response_length > string_length) {
+                                string_length = current_length + 1024;
+                                state_string = realloc(state_string, string_length);
+                                if (state_string == NULL)
                                         die(STATE_UNKNOWN, _("Cannot realloc()"));
                         }
-                        strcpy(&state_string[current_length],temp_string);
-                        current_length=current_length+response_length;
-                        state_string[current_length]=':';
+                        strcpy(&state_string[current_length], temp_string);
+                        current_length = current_length + response_length;
+                        state_string[current_length] = ':';
                         current_length++;
                         free(temp_string);
                 }
-                state_string[--current_length]='\0';
+                state_string[--current_length] = '\0';
                 if (verbose > 2)
-                        printf("State string=%s\n",state_string);
+                        printf("State string=%s\n", state_string);
 
                 /* This is not strictly the same as time now, but any subtle variations will cancel out */
-                np_state_write_string(current_time, state_string );
-                if(previous_state==NULL) {
+                np_state_write_string(current_time, state_string);
+                if (previous_state == NULL) {
                         /* Or should this be highest state? */
-                        die( STATE_OK, _("No previous data to calculate rate - assume okay" ) );
+                        die(STATE_OK, _("No previous data to calculate rate - assume okay"));
                 }
         }
 
-        printf ("%s %s -%s %s\n", label, state_text (result), outbuff, perfstr);
-        if (mult_resp) printf ("%s", mult_resp);
+        printf("%s %s -%s %s\n", label, state_text(result), outbuff, perfstr);
+        if (mult_resp)
+                printf("%s", mult_resp);
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        char *ptr;
-        int c = 1;
-        size_t j = 0, jj = 0;
-
-        int option = 0;
-        static struct option longopts[] = {
-                STD_LONG_OPTS,
-                {"community", required_argument, 0, 'C'},
-                {"oid", required_argument, 0, 'o'},
-                {"object", required_argument, 0, 'o'},
-                {"delimiter", required_argument, 0, 'd'},
-                {"nulloid", required_argument, 0, 'z'},
-                {"output-delimiter", required_argument, 0, 'D'},
-                {"string", required_argument, 0, 's'},
-                {"timeout", required_argument, 0, 't'},
-                {"regex", required_argument, 0, 'r'},
-                {"ereg", required_argument, 0, 'r'},
-                {"eregi", required_argument, 0, 'R'},
-                {"label", required_argument, 0, 'l'},
-                {"units", required_argument, 0, 'u'},
-                {"port", required_argument, 0, 'p'},
-                {"retries", required_argument, 0, 'e'},
-                {"miblist", required_argument, 0, 'm'},
-                {"protocol", required_argument, 0, 'P'},
-                {"context", required_argument, 0, 'N'},
-                {"seclevel", required_argument, 0, 'L'},
-                {"secname", required_argument, 0, 'U'},
-                {"authproto", required_argument, 0, 'a'},
-                {"privproto", required_argument, 0, 'x'},
-                {"authpasswd", required_argument, 0, 'A'},
-                {"privpasswd", required_argument, 0, 'X'},
-                {"next", no_argument, 0, 'n'},
-                {"rate", no_argument, 0, L_CALCULATE_RATE},
-                {"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
-                {"offset", required_argument, 0, L_OFFSET},
-                {"invert-search", no_argument, 0, L_INVERT_SEARCH},
-                {"perf-oids", no_argument, 0, 'O'},
-                {"ipv4", no_argument, 0, '4'},
-                {"ipv6", no_argument, 0, '6'},
-                {"multiplier", required_argument, 0, 'M'},
-                {"fmtstr", required_argument, 0, 'f'},
-                {"ignore-mib-parsing-errors", no_argument, false, L_IGNORE_MIB_PARSING_ERRORS},
-                {0, 0, 0, 0}
-        };
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {STD_LONG_OPTS,
+                                                                           {"community", required_argument, 0, 'C'},
+                                                                           {"oid", required_argument, 0, 'o'},
+                                                                           {"object", required_argument, 0, 'o'},
+                                                                           {"delimiter", required_argument, 0, 'd'},
+                                                                           {"nulloid", required_argument, 0, 'z'},
+                                                                           {"output-delimiter", required_argument, 0, 'D'},
+                                                                           {"string", required_argument, 0, 's'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"regex", required_argument, 0, 'r'},
+                                                                           {"ereg", required_argument, 0, 'r'},
+                                                                           {"eregi", required_argument, 0, 'R'},
+                                                                           {"label", required_argument, 0, 'l'},
+                                                                           {"units", required_argument, 0, 'u'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"retries", required_argument, 0, 'e'},
+                                                                           {"miblist", required_argument, 0, 'm'},
+                                                                           {"protocol", required_argument, 0, 'P'},
+                                                                           {"context", required_argument, 0, 'N'},
+                                                                           {"seclevel", required_argument, 0, 'L'},
+                                                                           {"secname", required_argument, 0, 'U'},
+                                                                           {"authproto", required_argument, 0, 'a'},
+                                                                           {"privproto", required_argument, 0, 'x'},
+                                                                           {"authpasswd", required_argument, 0, 'A'},
+                                                                           {"privpasswd", required_argument, 0, 'X'},
+                                                                           {"next", no_argument, 0, 'n'},
+                                                                           {"rate", no_argument, 0, L_CALCULATE_RATE},
+                                                                           {"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
+                                                                           {"offset", required_argument, 0, L_OFFSET},
+                                                                           {"invert-search", no_argument, 0, L_INVERT_SEARCH},
+                                                                           {"perf-oids", no_argument, 0, 'O'},
+                                                                           {"ipv4", no_argument, 0, '4'},
+                                                                           {"ipv6", no_argument, 0, '6'},
+                                                                           {"multiplier", required_argument, 0, 'M'},
+                                                                           {"fmtstr", required_argument, 0, 'f'},
+                                                                           {"ignore-mib-parsing-errors", no_argument, false, L_IGNORE_MIB_PARSING_ERRORS},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
                 return ERROR;
 
         /* reverse compatibility for very old non-POSIX usage forms */
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                if (strcmp ("-wv", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                if (strcmp ("-cv", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int c = 1; c < argc; c++) {
+                if (strcmp("-to", argv[c]) == 0)
+                        strcpy(argv[c], "-t");
+                if (strcmp("-wv", argv[c]) == 0)
+                        strcpy(argv[c], "-w");
+                if (strcmp("-cv", argv[c]) == 0)
+                        strcpy(argv[c], "-c");
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:",
-                                                                         longopts, &option);
+        size_t j = 0;
+        size_t jj = 0;
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case '?':       /* usage */
-                        usage5 ();
-                case 'h':       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
+                switch (option_char) {
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
                 case 'v': /* verbose */
                         verbose++;
                         break;
 
-        /* Connection info */
-                case 'C':                                                                       /* group or community */
+                        /* Connection info */
+                case 'C': /* group or community */
                         community = optarg;
                         break;
-                case 'H':                                                                       /* Host or server */
+                case 'H': /* Host or server */
                         server_address = optarg;
                         break;
-                case 'p':       /* TCP port number */
+                case 'p': /* TCP port number */
                         port = optarg;
                         break;
-                case 'm':       /* List of MIBS */
+                case 'm': /* List of MIBS */
                         miblist = optarg;
                         break;
-                case 'n':       /* usesnmpgetnext */
+                case 'n': /* usesnmpgetnext */
                         usesnmpgetnext = true;
                         break;
-                case 'P':       /* SNMP protocol version */
+                case 'P': /* SNMP protocol version */
                         proto = optarg;
                         break;
-                case 'N':       /* SNMPv3 context */
+                case 'N': /* SNMPv3 context */
                         context = optarg;
                         break;
-                case 'L':       /* security level */
+                case 'L': /* security level */
                         seclevel = optarg;
                         break;
-                case 'U':       /* security username */
+                case 'U': /* security username */
                         secname = optarg;
                         break;
-                case 'a':       /* auth protocol */
+                case 'a': /* auth protocol */
                         authproto = optarg;
                         break;
-                case 'x':       /* priv protocol */
+                case 'x': /* priv protocol */
                         privproto = optarg;
                         break;
-                case 'A':       /* auth passwd */
+                case 'A': /* auth passwd */
                         authpasswd = optarg;
                         break;
-                case 'X':       /* priv passwd */
+                case 'X': /* priv passwd */
                         privpasswd = optarg;
                         break;
-                case 't':       /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                case 't': /* timeout period */
+                        if (!is_integer(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
                         else
-                                timeout_interval = atoi (optarg);
+                                timeout_interval = atoi(optarg);
                         break;
 
-        /* Test parameters */
-                case 'c':                                                                       /* critical threshold */
+                        /* Test parameters */
+                case 'c': /* critical threshold */
                         critical_thresholds = optarg;
                         break;
-                case 'w':                                                                       /* warning threshold */
+                case 'w': /* warning threshold */
                         warning_thresholds = optarg;
                         break;
                 case 'e': /* PRELIMINARY - may change */
                 case 'E': /* PRELIMINARY - may change */
-                        if (!is_integer (optarg))
-                                usage2 (_("Retries interval must be a positive integer"), optarg);
+                        if (!is_integer(optarg))
+                                usage2(_("Retries interval must be a positive integer"), optarg);
                         else
                                 retries = atoi(optarg);
                         break;
-                case 'o':                                                                       /* object identifier */
-                        if ( strspn( optarg, "0123456789.," ) != strlen( optarg ) ) {
-                                        /*
-                                         * we have something other than digits, periods and comas,
-                                         * so we have a mib variable, rather than just an SNMP OID,
-                                         * so we have to actually read the mib files
-                                         */
-                                        needmibs = true;
+                case 'o': /* object identifier */
+                        if (strspn(optarg, "0123456789.,") != strlen(optarg)) {
+                                /*
+                                 * we have something other than digits, periods and comas,
+                                 * so we have a mib variable, rather than just an SNMP OID,
+                                 * so we have to actually read the mib files
+                                 */
+                                needmibs = true;
                         }
-                        for (ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", "), j++) {
+                        for (char *ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", "), j++) {
                                 while (j >= oids_size) {
                                         oids_size += OID_COUNT_STEP;
-                                        oids = realloc(oids, oids_size * sizeof (*oids));
+                                        oids = realloc(oids, oids_size * sizeof(*oids));
                                 }
                                 oids[j] = strdup(ptr);
                         }
                         numoids = j;
-                        if (c == 'E' || c == 'e') {
+                        if (option_char == 'E' || option_char == 'e') {
                                 jj++;
-                                while (j+1 >= eval_size) {
+                                while (j + 1 >= eval_size) {
                                         eval_size += OID_COUNT_STEP;
                                         eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
                                         memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
                                 }
-                                if (c == 'E')
-                                        eval_method[j+1] |= WARN_PRESENT;
-                                else if (c == 'e')
-                                        eval_method[j+1] |= CRIT_PRESENT;
+                                if (option_char == 'E')
+                                        eval_method[j + 1] |= WARN_PRESENT;
+                                else if (option_char == 'e')
+                                        eval_method[j + 1] |= CRIT_PRESENT;
                         }
                         break;
-                case 'z':       /* Null OID Return Check */
-                        if (!is_integer (optarg))
-                                usage2 (_("Exit status must be a positive integer"), optarg);
+                case 'z': /* Null OID Return Check */
+                        if (!is_integer(optarg))
+                                usage2(_("Exit status must be a positive integer"), optarg);
                         else
                                 nulloid = atoi(optarg);
                         break;
-                case 's':                                                                       /* string or substring */
-                        strncpy (string_value, optarg, sizeof (string_value) - 1);
-                        string_value[sizeof (string_value) - 1] = 0;
+                case 's': /* string or substring */
+                        strncpy(string_value, optarg, sizeof(string_value) - 1);
+                        string_value[sizeof(string_value) - 1] = 0;
                         while (jj >= eval_size) {
                                 eval_size += OID_COUNT_STEP;
                                 eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
@@ -872,17 +863,17 @@ process_arguments (int argc, char **argv)
                         }
                         eval_method[jj++] = CRIT_STRING;
                         break;
-                case 'R':                                                                       /* regex */
+                case 'R': /* regex */
                         cflags = REG_ICASE;
                         // fall through
-                case 'r':                                                                       /* regex */
+                case 'r': /* regex */
                         cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-                        strncpy (regex_expect, optarg, sizeof (regex_expect) - 1);
-                        regex_expect[sizeof (regex_expect) - 1] = 0;
-                        errcode = regcomp (&preg, regex_expect, cflags);
+                        strncpy(regex_expect, optarg, sizeof(regex_expect) - 1);
+                        regex_expect[sizeof(regex_expect) - 1] = 0;
+                        errcode = regcomp(&preg, regex_expect, cflags);
                         if (errcode != 0) {
-                                regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                printf (_("Could Not Compile Regular Expression"));
+                                regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Could Not Compile Regular Expression"));
                                 return ERROR;
                         }
                         while (jj >= eval_size) {
@@ -893,64 +884,64 @@ process_arguments (int argc, char **argv)
                         eval_method[jj++] = CRIT_REGEX;
                         break;
 
-        /* Format */
-                case 'd':                                                                       /* delimiter */
-                        delimiter = strscpy (delimiter, optarg);
+                        /* Format */
+                case 'd': /* delimiter */
+                        delimiter = strscpy(delimiter, optarg);
                         break;
-                case 'D':                                                                       /* output-delimiter */
-                        output_delim = strscpy (output_delim, optarg);
+                case 'D': /* output-delimiter */
+                        output_delim = strscpy(output_delim, optarg);
                         break;
-                case 'l':                                                                       /* label */
+                case 'l': /* label */
                         nlabels++;
                         if (nlabels > labels_size) {
                                 labels_size += 8;
-                                labels = realloc (labels, labels_size * sizeof(*labels));
+                                labels = realloc(labels, labels_size * sizeof(*labels));
                                 if (labels == NULL)
-                                        die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
+                                        die(STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                         }
                         labels[nlabels - 1] = optarg;
-                        ptr = thisarg (optarg);
+                        char *ptr = thisarg(optarg);
                         labels[nlabels - 1] = ptr;
                         if (ptr[0] == '\'')
                                 labels[nlabels - 1] = ptr + 1;
-                        while (ptr && (ptr = nextarg (ptr))) {
+                        while (ptr && (ptr = nextarg(ptr))) {
                                 nlabels++;
                                 if (nlabels > labels_size) {
                                         labels_size += 8;
-                                        labels = realloc (labels, labels_size * sizeof(*labels));
+                                        labels = realloc(labels, labels_size * sizeof(*labels));
                                         if (labels == NULL)
-                                                die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
+                                                die(STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                 }
-                                ptr = thisarg (ptr);
+                                ptr = thisarg(ptr);
                                 if (ptr[0] == '\'')
                                         labels[nlabels - 1] = ptr + 1;
                                 else
                                         labels[nlabels - 1] = ptr;
                         }
                         break;
-                case 'u':                                                                       /* units */
+                case 'u': /* units */
                         units = optarg;
                         nunits++;
                         if (nunits > unitv_size) {
                                 unitv_size += 8;
-                                unitv = realloc (unitv, unitv_size * sizeof(*unitv));
+                                unitv = realloc(unitv, unitv_size * sizeof(*unitv));
                                 if (unitv == NULL)
-                                        die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
+                                        die(STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                         }
                         unitv[nunits - 1] = optarg;
-                        ptr = thisarg (optarg);
+                        ptr = thisarg(optarg);
                         unitv[nunits - 1] = ptr;
                         if (ptr[0] == '\'')
                                 unitv[nunits - 1] = ptr + 1;
-                        while (ptr && (ptr = nextarg (ptr))) {
+                        while (ptr && (ptr = nextarg(ptr))) {
                                 if (nunits > unitv_size) {
                                         unitv_size += 8;
-                                        unitv = realloc (unitv, unitv_size * sizeof(*unitv));
+                                        unitv = realloc(unitv, unitv_size * sizeof(*unitv));
                                         if (units == NULL)
-                                                die (STATE_UNKNOWN, _("Could not realloc() units\n"));
+                                                die(STATE_UNKNOWN, _("Could not realloc() units\n"));
                                 }
                                 nunits++;
-                                ptr = thisarg (ptr);
+                                ptr = thisarg(ptr);
                                 if (ptr[0] == '\'')
                                         unitv[nunits - 1] = ptr + 1;
                                 else
@@ -958,38 +949,38 @@ process_arguments (int argc, char **argv)
                         }
                         break;
                 case L_CALCULATE_RATE:
-                        if(calculate_rate==0)
+                        if (calculate_rate == 0)
                                 np_enable_state(NULL, 1);
                         calculate_rate = 1;
                         break;
                 case L_RATE_MULTIPLIER:
-                        if(!is_integer(optarg)||((rate_multiplier=atoi(optarg))<=0))
-                                usage2(_("Rate multiplier must be a positive integer"),optarg);
+                        if (!is_integer(optarg) || ((rate_multiplier = atoi(optarg)) <= 0))
+                                usage2(_("Rate multiplier must be a positive integer"), optarg);
                         break;
                 case L_OFFSET:
-                        offset=strtod(optarg,NULL);
+                        offset = strtod(optarg, NULL);
                         break;
                 case L_INVERT_SEARCH:
-                        invert_search=1;
+                        invert_search = 1;
                         break;
                 case 'O':
-                        perf_labels=0;
+                        perf_labels = 0;
                         break;
                 case '4':
                         break;
                 case '6':
                         xasprintf(&ip_version, "udp6:");
-                        if(verbose>2)
+                        if (verbose > 2)
                                 printf("IPv6 detected! Will pass \"udp6:\" to snmpget.\n");
                         break;
                 case 'M':
-                        if ( strspn( optarg, "0123456789.," ) == strlen( optarg ) ) {
-                                multiplier=strtod(optarg,NULL);
+                        if (strspn(optarg, "0123456789.,") == strlen(optarg)) {
+                                multiplier = strtod(optarg, NULL);
                         }
                         break;
                 case 'f':
                         if (multiplier != 1.0) {
-                                fmtstr=optarg;
+                                fmtstr = optarg;
                                 fmtstr_set = true;
                         }
                         break;
@@ -1002,12 +993,11 @@ process_arguments (int argc, char **argv)
                 server_address = argv[optind];
 
         if (community == NULL)
-                community = strdup (DEFAULT_COMMUNITY);
+                community = strdup(DEFAULT_COMMUNITY);
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-
 /******************************************************************************
 
 @@-
@@ -1026,17 +1016,13 @@ selected.</para>
 -@@
 ******************************************************************************/
 
-
-
-static int
-validate_arguments ()
-{
+static int validate_arguments() {
         /* check whether to load locally installed MIBS (CPU/disk intensive) */
         if (miblist == NULL) {
                 if (needmibs) {
-                        miblist = strdup (DEFAULT_MIBLIST);
-                }else{
-                        miblist = "";                   /* don't read any mib files for numeric oids */
+                        miblist = strdup(DEFAULT_MIBLIST);
+                } else {
+                        miblist = ""; /* don't read any mib files for numeric oids */
                 }
         }
 
@@ -1051,18 +1037,17 @@ validate_arguments ()
         if (proto == NULL)
                 xasprintf(&proto, DEFAULT_PROTOCOL);
 
-        if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {     /* snmpv1 or snmpv2c */
+        if ((strcmp(proto, "1") == 0) || (strcmp(proto, "2c") == 0)) { /* snmpv1 or snmpv2c */
                 numauthpriv = 2;
-                authpriv = calloc (numauthpriv, sizeof (char *));
-                authpriv[0] = strdup ("-c");
-                authpriv[1] = strdup (community);
-        }
-        else if ( strcmp (proto, "3") == 0 ) {          /* snmpv3 args */
+                authpriv = calloc(numauthpriv, sizeof(char *));
+                authpriv[0] = strdup("-c");
+                authpriv[1] = strdup(community);
+        } else if (strcmp(proto, "3") == 0) { /* snmpv3 args */
                 if (!(context == NULL)) {
                         numcontext = 2;
-                        contextargs = calloc (numcontext, sizeof (char *));
-                        contextargs[0] = strdup ("-n");
-                        contextargs[1] = strdup (context);
+                        contextargs = calloc(numcontext, sizeof(char *));
+                        contextargs[0] = strdup("-n");
+                        contextargs[1] = strdup(context);
                 }
 
                 if (seclevel == NULL)
@@ -1073,284 +1058,266 @@ validate_arguments ()
 
                 if (strcmp(seclevel, "noAuthNoPriv") == 0) {
                         numauthpriv = 4;
-                        authpriv = calloc (numauthpriv, sizeof (char *));
-                        authpriv[0] = strdup ("-l");
-                        authpriv[1] = strdup ("noAuthNoPriv");
-                        authpriv[2] = strdup ("-u");
-                        authpriv[3] = strdup (secname);
+                        authpriv = calloc(numauthpriv, sizeof(char *));
+                        authpriv[0] = strdup("-l");
+                        authpriv[1] = strdup("noAuthNoPriv");
+                        authpriv[2] = strdup("-u");
+                        authpriv[3] = strdup(secname);
                 } else {
-                        if (! ( (strcmp(seclevel, "authNoPriv")==0) || (strcmp(seclevel, "authPriv")==0) ) ) {
-                                usage2 (_("Invalid seclevel"), seclevel);
+                        if (!((strcmp(seclevel, "authNoPriv") == 0) || (strcmp(seclevel, "authPriv") == 0))) {
+                                usage2(_("Invalid seclevel"), seclevel);
                         }
 
-                        if (authproto == NULL )
+                        if (authproto == NULL)
                                 xasprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
 
                         if (authpasswd == NULL)
                                 die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd");
 
-                        if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+                        if (strcmp(seclevel, "authNoPriv") == 0) {
                                 numauthpriv = 8;
-                                authpriv = calloc (numauthpriv, sizeof (char *));
-                                authpriv[0] = strdup ("-l");
-                                authpriv[1] = strdup ("authNoPriv");
-                                authpriv[2] = strdup ("-a");
-                                authpriv[3] = strdup (authproto);
-                                authpriv[4] = strdup ("-u");
-                                authpriv[5] = strdup (secname);
-                                authpriv[6] = strdup ("-A");
-                                authpriv[7] = strdup (authpasswd);
-                        } else if ( strcmp(seclevel, "authPriv") == 0 ) {
-                                if (privproto == NULL )
+                                authpriv = calloc(numauthpriv, sizeof(char *));
+                                authpriv[0] = strdup("-l");
+                                authpriv[1] = strdup("authNoPriv");
+                                authpriv[2] = strdup("-a");
+                                authpriv[3] = strdup(authproto);
+                                authpriv[4] = strdup("-u");
+                                authpriv[5] = strdup(secname);
+                                authpriv[6] = strdup("-A");
+                                authpriv[7] = strdup(authpasswd);
+                        } else if (strcmp(seclevel, "authPriv") == 0) {
+                                if (privproto == NULL)
                                         xasprintf(&privproto, DEFAULT_PRIV_PROTOCOL);
 
                                 if (privpasswd == NULL)
                                         die(STATE_UNKNOWN, _("Required parameter: %s\n"), "privpasswd");
 
                                 numauthpriv = 12;
-                                authpriv = calloc (numauthpriv, sizeof (char *));
-                                authpriv[0] = strdup ("-l");
-                                authpriv[1] = strdup ("authPriv");
-                                authpriv[2] = strdup ("-a");
-                                authpriv[3] = strdup (authproto);
-                                authpriv[4] = strdup ("-u");
-                                authpriv[5] = strdup (secname);
-                                authpriv[6] = strdup ("-A");
-                                authpriv[7] = strdup (authpasswd);
-                                authpriv[8] = strdup ("-x");
-                                authpriv[9] = strdup (privproto);
-                                authpriv[10] = strdup ("-X");
-                                authpriv[11] = strdup (privpasswd);
+                                authpriv = calloc(numauthpriv, sizeof(char *));
+                                authpriv[0] = strdup("-l");
+                                authpriv[1] = strdup("authPriv");
+                                authpriv[2] = strdup("-a");
+                                authpriv[3] = strdup(authproto);
+                                authpriv[4] = strdup("-u");
+                                authpriv[5] = strdup(secname);
+                                authpriv[6] = strdup("-A");
+                                authpriv[7] = strdup(authpasswd);
+                                authpriv[8] = strdup("-x");
+                                authpriv[9] = strdup(privproto);
+                                authpriv[10] = strdup("-X");
+                                authpriv[11] = strdup(privpasswd);
                         }
                 }
 
-        }
-        else {
-                usage2 (_("Invalid SNMP version"), proto);
+        } else {
+                usage2(_("Invalid SNMP version"), proto);
         }
 
         return OK;
 }
 
-
-
 /* trim leading whitespace
          if there is a leading quote, make sure it balances */
 
-static char *
-thisarg (char *str)
-{
-        str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
-        if (str[0] == '\'') {   /* handle SIMPLE quoted strings */
-                if (strlen (str) == 1 || !strstr (str + 1, "'"))
-                        die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
+static char *thisarg(char *str) {
+        str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
+        if (str[0] == '\'') {          /* handle SIMPLE quoted strings */
+                if (strlen(str) == 1 || !strstr(str + 1, "'"))
+                        die(STATE_UNKNOWN, _("Unbalanced quotes\n"));
         }
         return str;
 }
 
-
-
 /* if there's a leading quote, advance to the trailing quote
          set the trailing quote to '\x0'
          if the string continues, advance beyond the comma */
 
-static char *
-nextarg (char *str)
-{
+static char *nextarg(char *str) {
         if (str[0] == '\'') {
                 str[0] = 0;
-                if (strlen (str) > 1) {
-                        str = strstr (str + 1, "'");
+                if (strlen(str) > 1) {
+                        str = strstr(str + 1, "'");
                         return (++str);
-                }
-                else {
+                } else {
                         return NULL;
                 }
         }
         if (str[0] == ',') {
                 str[0] = 0;
-                if (strlen (str) > 1) {
+                if (strlen(str) > 1) {
                         return (++str);
-                }
-                else {
+                } else {
                         return NULL;
                 }
         }
-        if ((str = strstr (str, ",")) && strlen (str) > 1) {
+        if ((str = strstr(str, ",")) && strlen(str) > 1) {
                 str[0] = 0;
                 return (++str);
         }
         return NULL;
 }
 
-
-
 /* multiply result (values 0 < n < 1 work as divider) */
-static char *
-multiply (char *str)
-{
-        char *endptr;
-        double val;
-        char *conv = "%f";
-
-        if(multiplier == 1)
-                return(str);
+static char *multiply(char *str) {
+        if (multiplier == 1)
+                return (str);
 
-        if(verbose>2)
+        if (verbose > 2)
                 printf("    multiply input: %s\n", str);
 
-        val = strtod (str, &endptr);
+        char *endptr;
+        double val = strtod(str, &endptr);
         if ((val == 0.0) && (endptr == str)) {
                 die(STATE_UNKNOWN, _("multiplier set (%.1f), but input is not a number: %s"), multiplier, str);
         }
 
-        if(verbose>2)
+        if (verbose > 2)
                 printf("    multiply extracted double: %f\n", val);
+
         val *= multiplier;
+        char *conv = "%f";
         if (fmtstr_set) {
                 conv = fmtstr;
         }
         if (val == (int)val) {
                 snprintf(buffer, DEFAULT_BUFFER_SIZE, "%.0f", val);
         } else {
-                if(verbose>2)
+                if (verbose > 2)
                         printf("    multiply using format: %s\n", conv);
                 snprintf(buffer, DEFAULT_BUFFER_SIZE, conv, val);
         }
-        if(verbose>2)
+        if (verbose > 2)
                 printf("    multiply result: %s\n", buffer);
         return buffer;
 }
 
+static void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-static void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
+        printf("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (UT_IPv46);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(UT_IPv46);
 
-        printf (UT_HOST_PORT, 'p', DEFAULT_PORT);
+        printf(UT_HOST_PORT, 'p', DEFAULT_PORT);
 
         /* SNMP and Authentication Protocol */
-        printf (" %s\n", "-n, --next");
-        printf ("    %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
-        printf (" %s\n", "-P, --protocol=[1|2c|3]");
-        printf ("    %s\n", _("SNMP protocol version"));
-        printf (" %s\n", "-N, --context=CONTEXT");
-        printf ("    %s\n", _("SNMPv3 context"));
-        printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
-        printf ("    %s\n", _("SNMPv3 securityLevel"));
-        printf (" %s\n", "-a, --authproto=AUTHENTICATION_PROTOCOL");
-        printf ("    %s\n", _("SNMPv3 authentication protocol (default MD5), available options depend on the specific version of the net-snmp tools"));
-        printf ("    %s\n", _("if < 5.8 SHA (1) and MD5 should be available, if >= 5.8 additionally SHA-224, SHA-256, SHA-384 and SHA-512"));
-        printf (" %s\n", "-x, --privproto=PRIVACY_PROTOCOL");
-        printf ("    %s\n", _("SNMPv3 privacy protocol (default DES), available options depend on the specific version of the net-snmp tools"));
-        printf ("    %s\n", _("if < 5.8 DES and AES should be available, if >= 5.8 additionally AES-192 and AES-256"));
+        printf(" %s\n", "-n, --next");
+        printf("    %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
+        printf(" %s\n", "-P, --protocol=[1|2c|3]");
+        printf("    %s\n", _("SNMP protocol version"));
+        printf(" %s\n", "-N, --context=CONTEXT");
+        printf("    %s\n", _("SNMPv3 context"));
+        printf(" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
+        printf("    %s\n", _("SNMPv3 securityLevel"));
+        printf(" %s\n", "-a, --authproto=AUTHENTICATION_PROTOCOL");
+        printf("    %s\n",
+                   _("SNMPv3 authentication protocol (default MD5), available options depend on the specific version of the net-snmp tools"));
+        printf("    %s\n", _("if < 5.8 SHA (1) and MD5 should be available, if >= 5.8 additionally SHA-224, SHA-256, SHA-384 and SHA-512"));
+        printf(" %s\n", "-x, --privproto=PRIVACY_PROTOCOL");
+        printf("    %s\n", _("SNMPv3 privacy protocol (default DES), available options depend on the specific version of the net-snmp tools"));
+        printf("    %s\n", _("if < 5.8 DES and AES should be available, if >= 5.8 additionally AES-192 and AES-256"));
 
         /* Authentication Tokens*/
-        printf (" %s\n", "-C, --community=STRING");
-        printf ("    %s ", _("Optional community string for SNMP communication"));
-        printf ("(%s \"%s\")\n", _("default is") ,DEFAULT_COMMUNITY);
-        printf (" %s\n", "-U, --secname=USERNAME");
-        printf ("    %s\n", _("SNMPv3 username"));
-        printf (" %s\n", "-A, --authpasswd=PASSWORD");
-        printf ("    %s\n", _("SNMPv3 authentication password"));
-        printf (" %s\n", "-X, --privpasswd=PASSWORD");
-        printf ("    %s\n", _("SNMPv3 privacy password"));
+        printf(" %s\n", "-C, --community=STRING");
+        printf("    %s ", _("Optional community string for SNMP communication"));
+        printf("(%s \"%s\")\n", _("default is"), DEFAULT_COMMUNITY);
+        printf(" %s\n", "-U, --secname=USERNAME");
+        printf("    %s\n", _("SNMPv3 username"));
+        printf(" %s\n", "-A, --authpasswd=PASSWORD");
+        printf("    %s\n", _("SNMPv3 authentication password"));
+        printf(" %s\n", "-X, --privpasswd=PASSWORD");
+        printf("    %s\n", _("SNMPv3 privacy password"));
 
         /* OID Stuff */
-        printf (" %s\n", "-o, --oid=OID(s)");
-        printf ("    %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
-        printf (" %s\n", "-m, --miblist=STRING");
-        printf ("    %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
-        printf ("    %s\n", _("for symbolic OIDs.)"));
-        printf (" %s\n", "-d, --delimiter=STRING");
-        printf ("    %s \"%s\"\n", _("Delimiter to use when parsing returned data. Default is"), DEFAULT_DELIMITER);
-        printf ("    %s\n", _("Any data on the right hand side of the delimiter is considered"));
-        printf ("    %s\n", _("to be the data that should be used in the evaluation."));
-        printf (" %s\n", "-z, --nulloid=#");
-        printf ("    %s\n", _("If the check returns a 0 length string or NULL value"));
-        printf ("    %s\n", _("This option allows you to choose what status you want it to exit"));
-        printf ("    %s\n", _("Excluding this option renders the default exit of 3(STATE_UNKNOWN)"));
-        printf ("    %s\n", _("0 = OK"));
-        printf ("    %s\n", _("1 = WARNING"));
-        printf ("    %s\n", _("2 = CRITICAL"));
-        printf ("    %s\n", _("3 = UNKNOWN"));
+        printf(" %s\n", "-o, --oid=OID(s)");
+        printf("    %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
+        printf(" %s\n", "-m, --miblist=STRING");
+        printf("    %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
+        printf("    %s\n", _("for symbolic OIDs.)"));
+        printf(" %s\n", "-d, --delimiter=STRING");
+        printf("    %s \"%s\"\n", _("Delimiter to use when parsing returned data. Default is"), DEFAULT_DELIMITER);
+        printf("    %s\n", _("Any data on the right hand side of the delimiter is considered"));
+        printf("    %s\n", _("to be the data that should be used in the evaluation."));
+        printf(" %s\n", "-z, --nulloid=#");
+        printf("    %s\n", _("If the check returns a 0 length string or NULL value"));
+        printf("    %s\n", _("This option allows you to choose what status you want it to exit"));
+        printf("    %s\n", _("Excluding this option renders the default exit of 3(STATE_UNKNOWN)"));
+        printf("    %s\n", _("0 = OK"));
+        printf("    %s\n", _("1 = WARNING"));
+        printf("    %s\n", _("2 = CRITICAL"));
+        printf("    %s\n", _("3 = UNKNOWN"));
 
         /* Tests Against Integers */
-        printf (" %s\n", "-w, --warning=THRESHOLD(s)");
-        printf ("    %s\n", _("Warning threshold range(s)"));
-        printf (" %s\n", "-c, --critical=THRESHOLD(s)");
-        printf ("    %s\n", _("Critical threshold range(s)"));
-        printf (" %s\n", "--rate");
-        printf ("    %s\n", _("Enable rate calculation. See 'Rate Calculation' below"));
-        printf (" %s\n", "--rate-multiplier");
-        printf ("    %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
-        printf (" %s\n", "--offset=OFFSET");
-        printf ("    %s\n", _("Add/subtract the specified OFFSET to numeric sensor data"));
+        printf(" %s\n", "-w, --warning=THRESHOLD(s)");
+        printf("    %s\n", _("Warning threshold range(s)"));
+        printf(" %s\n", "-c, --critical=THRESHOLD(s)");
+        printf("    %s\n", _("Critical threshold range(s)"));
+        printf(" %s\n", "--rate");
+        printf("    %s\n", _("Enable rate calculation. See 'Rate Calculation' below"));
+        printf(" %s\n", "--rate-multiplier");
+        printf("    %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
+        printf(" %s\n", "--offset=OFFSET");
+        printf("    %s\n", _("Add/subtract the specified OFFSET to numeric sensor data"));
 
         /* Tests Against Strings */
-        printf (" %s\n", "-s, --string=STRING");
-        printf ("    %s\n", _("Return OK state (for that OID) if STRING is an exact match"));
-        printf (" %s\n", "-r, --ereg=REGEX");
-        printf ("    %s\n", _("Return OK state (for that OID) if extended regular expression REGEX matches"));
-        printf (" %s\n", "-R, --eregi=REGEX");
-        printf ("    %s\n", _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
-        printf (" %s\n", "--invert-search");
-        printf ("    %s\n", _("Invert search result (CRITICAL if found)"));
+        printf(" %s\n", "-s, --string=STRING");
+        printf("    %s\n", _("Return OK state (for that OID) if STRING is an exact match"));
+        printf(" %s\n", "-r, --ereg=REGEX");
+        printf("    %s\n", _("Return OK state (for that OID) if extended regular expression REGEX matches"));
+        printf(" %s\n", "-R, --eregi=REGEX");
+        printf("    %s\n", _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
+        printf(" %s\n", "--invert-search");
+        printf("    %s\n", _("Invert search result (CRITICAL if found)"));
 
         /* Output Formatting */
-        printf (" %s\n", "-l, --label=STRING");
-        printf ("    %s\n", _("Prefix label for output from plugin"));
-        printf (" %s\n", "-u, --units=STRING");
-        printf ("    %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
-        printf (" %s\n", "-D, --output-delimiter=STRING");
-        printf ("    %s\n", _("Separates output on multiple OID requests"));
-        printf (" %s\n", "-M, --multiplier=FLOAT");
-        printf ("    %s\n", _("Multiplies current value, 0 < n < 1 works as divider, defaults to 1"));
-        printf (" %s\n", "-f, --fmtstr=STRING");
-        printf ("    %s\n", _("C-style format string for float values (see option -M)"));
-
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf ("    %s\n", _("NOTE the final timeout value is calculated using this formula: timeout_interval * retries + 5"));
-        printf (" %s\n", "-e, --retries=INTEGER");
-        printf ("    %s%i\n", _("Number of retries to be used in the requests, default: "), DEFAULT_RETRIES);
-
-        printf (" %s\n", "-O, --perf-oids");
-        printf ("    %s\n", _("Label performance data with OIDs instead of --label's"));
-
-        printf (" %s\n", "--ignore-mib-parsing-errors");
-        printf ("    %s\n", _("Tell snmpget to not print errors encountered when parsing MIB files"));
-
-        printf (UT_VERBOSE);
-
-        printf ("\n");
-        printf ("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
-        printf ("%s\n", _("if you don't have the package installed, you will need to download it from"));
-        printf ("%s\n", _("http://net-snmp.sourceforge.net before you can use this plugin."));
-
-        printf ("\n");
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "));
-        printf ("   %s\n", _("list (lists with internal spaces must be quoted)."));
+        printf(" %s\n", "-l, --label=STRING");
+        printf("    %s\n", _("Prefix label for output from plugin"));
+        printf(" %s\n", "-u, --units=STRING");
+        printf("    %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
+        printf(" %s\n", "-D, --output-delimiter=STRING");
+        printf("    %s\n", _("Separates output on multiple OID requests"));
+        printf(" %s\n", "-M, --multiplier=FLOAT");
+        printf("    %s\n", _("Multiplies current value, 0 < n < 1 works as divider, defaults to 1"));
+        printf(" %s\n", "-f, --fmtstr=STRING");
+        printf("    %s\n", _("C-style format string for float values (see option -M)"));
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf("    %s\n", _("NOTE the final timeout value is calculated using this formula: timeout_interval * retries + 5"));
+        printf(" %s\n", "-e, --retries=INTEGER");
+        printf("    %s%i\n", _("Number of retries to be used in the requests, default: "), DEFAULT_RETRIES);
+
+        printf(" %s\n", "-O, --perf-oids");
+        printf("    %s\n", _("Label performance data with OIDs instead of --label's"));
+
+        printf(" %s\n", "--ignore-mib-parsing-errors");
+        printf("    %s\n", _("Tell snmpget to not print errors encountered when parsing MIB files"));
+
+        printf(UT_VERBOSE);
+
+        printf("\n");
+        printf("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
+        printf("%s\n", _("if you don't have the package installed, you will need to download it from"));
+        printf("%s\n", _("http://net-snmp.sourceforge.net before you can use this plugin."));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "));
+        printf("   %s\n", _("list (lists with internal spaces must be quoted)."));
 
         printf(" -%s", UT_THRESHOLDS_NOTES);
 
-        printf (" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
-        printf (" %s\n", _("- Note that only one string and one regex may be checked at present"));
-        printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
-        printf ("   %s\n", _("returned from the SNMP query is an unsigned integer."));
+        printf(" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
+        printf(" %s\n", _("- Note that only one string and one regex may be checked at present"));
+        printf(" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
+        printf("   %s\n", _("returned from the SNMP query is an unsigned integer."));
 
         printf("\n");
         printf("%s\n", _("Rate Calculation:"));
@@ -1362,19 +1329,15 @@ print_help (void)
         printf(" %s\n", _("The state is uniquely determined by the arguments to the plugin, so"));
         printf(" %s\n", _("changing the arguments will create a new state file."));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n",progname);
-        printf ("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
-        printf ("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
-        printf ("[-m miblist] [-P snmp version] [-N context] [-L seclevel] [-U secname]\n");
-        printf ("[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd] [-4|6]\n");
-        printf ("[-M multiplier [-f format]]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n", progname);
+        printf("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
+        printf("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
+        printf("[-m miblist] [-P snmp version] [-N context] [-L seclevel] [-U secname]\n");
+        printf("[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd] [-4|6]\n");
+        printf("[-M multiplier [-f format]]\n");
 }
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 34ef37b..e9c55ad 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -3,7 +3,7 @@
 * Monitoring check_ssh plugin
 *
 * License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
+* Copyright (c) 2000-2024 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -29,7 +29,7 @@
 *****************************************************************************/
 
 const char *progname = "check_ssh";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "./common.h"
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 01dd35e..c13ac76 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-*
-* Monitoring check_tcp plugin
-*
-* License: GPL
-* Copyright (c) 1999-2013 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_tcp plugin
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* $Id$
-*
-*****************************************************************************/
+ *
+ * Monitoring check_tcp plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_tcp plugin
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * $Id$
+ *
+ *****************************************************************************/
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
-const char *copyright = "1999-2008";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -43,17 +43,17 @@ const char *email = "devel@monitoring-plugins.org";
 #ifdef HAVE_SSL
 static bool check_cert = false;
 static int days_till_exp_warn, days_till_exp_crit;
-# define my_recv(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
-# define my_send(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
+#       define my_recv(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
+#       define my_send(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
 #else
-# define my_recv(buf, len) read(sd, buf, len)
-# define my_send(buf, len) send(sd, buf, len, 0)
+#       define my_recv(buf, len) read(sd, buf, len)
+#       define my_send(buf, len) send(sd, buf, len, 0)
 #endif
 
 /* int my_recv(char *, size_t); */
-static int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+void print_usage(void);
 
 #define EXPECT server_expect[0]
 static char *SERVICE = "TCP";
@@ -91,38 +91,29 @@ static char *sni = NULL;
 static bool sni_specified = false;
 #endif
 
-#define FLAG_SSL 0x01
-#define FLAG_VERBOSE 0x02
-#define FLAG_TIME_WARN 0x04
-#define FLAG_TIME_CRIT 0x08
+#define FLAG_SSL         0x01
+#define FLAG_VERBOSE     0x02
+#define FLAG_TIME_WARN   0x04
+#define FLAG_TIME_CRIT   0x08
 #define FLAG_HIDE_OUTPUT 0x10
 static size_t flags;
 
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char *status = NULL;
-        struct timeval tv;
-        struct timeval timeout;
-        int match = -1;
-        fd_set rfds;
-
-        FD_ZERO(&rfds);
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* determine program- and service-name quickly */
         progname = strrchr(argv[0], '/');
-        if(progname != NULL) progname++;
-        else progname = argv[0];
+        if (progname != NULL)
+                progname++;
+        else
+                progname = argv[0];
 
         size_t prog_name_len = strlen(progname);
-        if(prog_name_len > 6 && !memcmp(progname, "check_", 6)) {
+        if (prog_name_len > 6 && !memcmp(progname, "check_", 6)) {
                 SERVICE = strdup(progname + 6);
-                for(size_t i = 0; i < prog_name_len - 6; i++)
+                for (size_t i = 0; i < prog_name_len - 6; i++)
                         SERVICE[i] = toupper(SERVICE[i]);
         }
 
@@ -133,23 +124,19 @@ main (int argc, char **argv)
         /* determine defaults for this service's protocol */
         if (!strncmp(SERVICE, "UDP", 3)) {
                 PROTOCOL = IPPROTO_UDP;
-        }
-        else if (!strncmp(SERVICE, "FTP", 3)) {
+        } else if (!strncmp(SERVICE, "FTP", 3)) {
                 EXPECT = "220";
                 QUIT = "QUIT\r\n";
                 PORT = 21;
-        }
-        else if (!strncmp(SERVICE, "POP", 3) || !strncmp(SERVICE, "POP3", 4)) {
+        } else if (!strncmp(SERVICE, "POP", 3) || !strncmp(SERVICE, "POP3", 4)) {
                 EXPECT = "+OK";
                 QUIT = "QUIT\r\n";
                 PORT = 110;
-        }
-        else if (!strncmp(SERVICE, "SMTP", 4)) {
+        } else if (!strncmp(SERVICE, "SMTP", 4)) {
                 EXPECT = "220";
                 QUIT = "QUIT\r\n";
                 PORT = 25;
-        }
-        else if (!strncmp(SERVICE, "IMAP", 4)) {
+        } else if (!strncmp(SERVICE, "IMAP", 4)) {
                 EXPECT = "* OK";
                 QUIT = "a1 LOGOUT\r\n";
                 PORT = 143;
@@ -160,27 +147,23 @@ main (int argc, char **argv)
                 QUIT = "a1 LOGOUT\r\n";
                 flags |= FLAG_SSL;
                 PORT = 993;
-        }
-        else if (!strncmp(SERVICE, "SPOP", 4)) {
+        } else if (!strncmp(SERVICE, "SPOP", 4)) {
                 EXPECT = "+OK";
                 QUIT = "QUIT\r\n";
                 flags |= FLAG_SSL;
                 PORT = 995;
-        }
-        else if (!strncmp(SERVICE, "SSMTP", 5)) {
+        } else if (!strncmp(SERVICE, "SSMTP", 5)) {
                 EXPECT = "220";
                 QUIT = "QUIT\r\n";
                 flags |= FLAG_SSL;
                 PORT = 465;
-        }
-        else if (!strncmp(SERVICE, "JABBER", 6)) {
+        } else if (!strncmp(SERVICE, "JABBER", 6)) {
                 SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
                 EXPECT = "<?xml version=\'1.0\'";
                 QUIT = "</stream:stream>\n";
                 flags |= FLAG_HIDE_OUTPUT;
                 PORT = 5222;
-        }
-        else if (!strncmp (SERVICE, "NNTPS", 5)) {
+        } else if (!strncmp(SERVICE, "NNTPS", 5)) {
                 server_expect_count = 2;
                 server_expect[0] = "200";
                 server_expect[1] = "201";
@@ -189,83 +172,86 @@ main (int argc, char **argv)
                 PORT = 563;
         }
 #endif
-        else if (!strncmp (SERVICE, "NNTP", 4)) {
+        else if (!strncmp(SERVICE, "NNTP", 4)) {
                 server_expect_count = 2;
                 server_expect = malloc(sizeof(char *) * server_expect_count);
                 server_expect[0] = strdup("200");
                 server_expect[1] = strdup("201");
                 QUIT = "QUIT\r\n";
                 PORT = 119;
-        }
-        else if (!strncmp(SERVICE, "CLAMD", 5)) {
+        } else if (!strncmp(SERVICE, "CLAMD", 5)) {
                 SEND = "PING";
                 EXPECT = "PONG";
                 QUIT = NULL;
                 PORT = 3310;
         }
         /* fallthrough check, so it's supposed to use reverse matching */
-        else if (strcmp (SERVICE, "TCP"))
-                usage (_("CRITICAL - Generic check_tcp called with unknown service\n"));
+        else if (strcmp(SERVICE, "TCP"))
+                usage(_("CRITICAL - Generic check_tcp called with unknown service\n"));
 
         server_address = "127.0.0.1";
         server_port = PORT;
         server_send = SEND;
         server_quit = QUIT;
-        status = NULL;
+        char *status = NULL;
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
-        if(flags & FLAG_VERBOSE) {
+        if (flags & FLAG_VERBOSE) {
                 printf("Using service %s\n", SERVICE);
                 printf("Port: %d\n", server_port);
                 printf("flags: 0x%x\n", (int)flags);
         }
 
-        if(EXPECT && !server_expect_count)
+        if (EXPECT && !server_expect_count)
                 server_expect_count++;
 
-        if(PROTOCOL==IPPROTO_UDP && !(server_expect_count && server_send)){
+        if (PROTOCOL == IPPROTO_UDP && !(server_expect_count && server_send)) {
                 usage(_("With UDP checks, a send/expect string must be specified."));
         }
 
         /* set up the timer */
-        signal (SIGALRM, socket_timeout_alarm_handler);
-        alarm (socket_timeout);
+        signal(SIGALRM, socket_timeout_alarm_handler);
+        alarm(socket_timeout);
 
         /* try to connect to the host at the given port number */
-        gettimeofday (&tv, NULL);
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
 
-        result = np_net_connect (server_address, server_port, &sd, PROTOCOL);
-        if (result == STATE_CRITICAL) return econn_refuse_state;
+        int result = STATE_UNKNOWN;
+        result = np_net_connect(server_address, server_port, &sd, PROTOCOL);
+        if (result == STATE_CRITICAL)
+                return econn_refuse_state;
 
 #ifdef HAVE_SSL
-        if (flags & FLAG_SSL){
+        if (flags & FLAG_SSL) {
                 result = np_net_ssl_init_with_hostname(sd, (sni_specified ? sni : NULL));
                 if (result == STATE_OK && check_cert) {
                         result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
                 }
         }
-        if(result != STATE_OK){
-                if(sd) close(sd);
+        if (result != STATE_OK) {
+                if (sd)
+                        close(sd);
                 np_net_ssl_cleanup();
                 return result;
         }
 #endif /* HAVE_SSL */
 
-        if (server_send != NULL) {              /* Something to send? */
+        if (server_send != NULL) { /* Something to send? */
                 my_send(server_send, strlen(server_send));
         }
 
         if (delay > 0) {
                 tv.tv_sec += delay;
-                sleep (delay);
+                sleep(delay);
         }
 
-        if(flags & FLAG_VERBOSE) {
+        if (flags & FLAG_VERBOSE) {
                 if (server_send) {
                         printf("Send string: %s\n", server_send);
                 }
@@ -273,13 +259,17 @@ main (int argc, char **argv)
                         printf("Quit string: %s\n", server_quit);
                 }
                 printf("server_expect_count: %d\n", (int)server_expect_count);
-                for(size_t i = 0; i < server_expect_count; i++)
+                for (size_t i = 0; i < server_expect_count; i++)
                         printf("\t%zd: %s\n", i, server_expect[i]);
         }
 
         /* if(len) later on, we know we have a non-NULL response */
         ssize_t len = 0;
 
+        int match = -1;
+        struct timeval timeout;
+        fd_set rfds;
+        FD_ZERO(&rfds);
         if (server_expect_count) {
                 ssize_t received = 0;
 
@@ -294,17 +284,14 @@ main (int argc, char **argv)
                         if (maxbytes && len >= maxbytes)
                                 break;
 
-                        if ((match = np_expect_match(status,
-                            server_expect,
-                            server_expect_count,
-                            match_flags)) != NP_MATCH_RETRY)
+                        if ((match = np_expect_match(status, server_expect, server_expect_count, match_flags)) != NP_MATCH_RETRY)
                                 break;
 
                         /* some protocols wait for further input, so make sure we don't wait forever */
                         FD_SET(sd, &rfds);
-                        timeout.tv_sec  = READ_TIMEOUT;
+                        timeout.tv_sec = READ_TIMEOUT;
                         timeout.tv_usec = 0;
-                        if(select(sd + 1, &rfds, NULL, NULL, &timeout) <= 0)
+                        if (select(sd + 1, &rfds, NULL, NULL, &timeout) <= 0)
                                 break;
                 }
 
@@ -313,26 +300,26 @@ main (int argc, char **argv)
 
                 /* no data when expected, so return critical */
                 if (len == 0)
-                        die (STATE_CRITICAL, _("No data received from host\n"));
+                        die(STATE_CRITICAL, _("No data received from host\n"));
 
                 /* print raw output if we're debugging */
-                if(flags & FLAG_VERBOSE)
-                        printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n",
-                               (int)len + 1, status);
+                if (flags & FLAG_VERBOSE)
+                        printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n", (int)len + 1, status);
                 /* strip whitespace from end of output */
-                while(--len > 0 && isspace(status[len]))
+                while (--len > 0 && isspace(status[len]))
                         status[len] = '\0';
         }
 
         if (server_quit != NULL) {
                 my_send(server_quit, strlen(server_quit));
         }
-        if (sd) close (sd);
+        if (sd)
+                close(sd);
 #ifdef HAVE_SSL
         np_net_ssl_cleanup();
 #endif
 
-        microsec = deltime (tv);
+        microsec = deltime(tv);
         elapsed_time = (double)microsec / 1.0e6;
 
         if (flags & FLAG_TIME_CRIT && elapsed_time > critical_time)
@@ -341,142 +328,123 @@ main (int argc, char **argv)
                 result = STATE_WARNING;
 
         /* did we get the response we hoped? */
-        if(match == NP_MATCH_FAILURE && result != STATE_CRITICAL)
+        if (match == NP_MATCH_FAILURE && result != STATE_CRITICAL)
                 result = expect_mismatch_state;
 
         /* reset the alarm */
-        alarm (0);
+        alarm(0);
 
         /* this is a bit stupid, because we don't want to print the
          * response time (which can look ok to the user) if we didn't get
          * the response we were looking for. if-else */
         printf("%s %s - ", SERVICE, state_text(result));
 
-        if(match == NP_MATCH_FAILURE && len && !(flags & FLAG_HIDE_OUTPUT))
+        if (match == NP_MATCH_FAILURE && len && !(flags & FLAG_HIDE_OUTPUT))
                 printf("Unexpected response from host/socket: %s", status);
         else {
-                if(match == NP_MATCH_FAILURE)
+                if (match == NP_MATCH_FAILURE)
                         printf("Unexpected response from host/socket on ");
                 else
                         printf("%.3f second response time on ", elapsed_time);
-                if(server_address[0] != '/') {
+                if (server_address[0] != '/') {
                         if (host_specified)
-                                printf("%s port %d",
-                                       server_address, server_port);
+                                printf("%s port %d", server_address, server_port);
                         else
                                 printf("port %d", server_port);
-                }
-                else
+                } else
                         printf("socket %s", server_address);
         }
 
         if (match != NP_MATCH_FAILURE && !(flags & FLAG_HIDE_OUTPUT) && len)
-                printf (" [%s]", status);
+                printf(" [%s]", status);
 
         /* perf-data doesn't apply when server doesn't talk properly,
          * so print all zeroes on warn and crit. Use fperfdata since
          * localisation settings can make different outputs */
-        if(match == NP_MATCH_FAILURE)
-                printf ("|%s",
-                                fperfdata ("time", elapsed_time, "s",
-                                (flags & FLAG_TIME_WARN ? true : false), 0,
-                                (flags & FLAG_TIME_CRIT ? true : false), 0,
-                                true, 0,
-                                true, socket_timeout)
-                        );
+        if (match == NP_MATCH_FAILURE)
+                printf("|%s", fperfdata("time", elapsed_time, "s", (flags & FLAG_TIME_WARN ? true : false), 0,
+                                                                (flags & FLAG_TIME_CRIT ? true : false), 0, true, 0, true, socket_timeout));
         else
-                printf("|%s",
-                                fperfdata ("time", elapsed_time, "s",
-                                (flags & FLAG_TIME_WARN ? true : false), warning_time,
-                                (flags & FLAG_TIME_CRIT ? true : false), critical_time,
-                                true, 0,
-                                true, socket_timeout)
-                        );
+                printf("|%s", fperfdata("time", elapsed_time, "s", (flags & FLAG_TIME_WARN ? true : false), warning_time,
+                                                                (flags & FLAG_TIME_CRIT ? true : false), critical_time, true, 0, true, socket_timeout));
 
         putchar('\n');
         return result;
 }
 
-
-
 /* process command-line arguments */
-static int process_arguments (int argc, char **argv) {
-        int c;
-        bool escape = false;
-        char *temp;
-
+static int process_arguments(int argc, char **argv) {
         enum {
                 SNI_OPTION = CHAR_MAX + 1
         };
 
-        int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"critical-codes", required_argument, 0, 'C'},
-                {"warning-codes", required_argument, 0, 'W'},
-                {"timeout", required_argument, 0, 't'},
-                {"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
-                {"port", required_argument, 0, 'p'},
-                {"escape", no_argument, 0, 'E'},
-                {"all", no_argument, 0, 'A'},
-                {"send", required_argument, 0, 's'},
-                {"expect", required_argument, 0, 'e'},
-                {"maxbytes", required_argument, 0, 'm'},
-                {"quit", required_argument, 0, 'q'},
-                {"jail", no_argument, 0, 'j'},
-                {"delay", required_argument, 0, 'd'},
-                {"refuse", required_argument, 0, 'r'},
-                {"mismatch", required_argument, 0, 'M'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"ssl", no_argument, 0, 'S'},
-                {"sni", required_argument, 0, SNI_OPTION},
-                {"certificate", required_argument, 0, 'D'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical-codes", required_argument, 0, 'C'},
+                                                                           {"warning-codes", required_argument, 0, 'W'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"escape", no_argument, 0, 'E'},
+                                                                           {"all", no_argument, 0, 'A'},
+                                                                           {"send", required_argument, 0, 's'},
+                                                                           {"expect", required_argument, 0, 'e'},
+                                                                           {"maxbytes", required_argument, 0, 'm'},
+                                                                           {"quit", required_argument, 0, 'q'},
+                                                                           {"jail", no_argument, 0, 'j'},
+                                                                           {"delay", required_argument, 0, 'd'},
+                                                                           {"refuse", required_argument, 0, 'r'},
+                                                                           {"mismatch", required_argument, 0, 'M'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"ssl", no_argument, 0, 'S'},
+                                                                           {"sni", required_argument, 0, SNI_OPTION},
+                                                                           {"certificate", required_argument, 0, 'D'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
-                usage4 (_("No arguments found"));
+                usage4(_("No arguments found"));
 
         /* backwards compatibility */
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0)
+                        strcpy(argv[i], "-t");
+                else if (strcmp("-wt", argv[i]) == 0)
+                        strcpy(argv[i], "-w");
+                else if (strcmp("-ct", argv[i]) == 0)
+                        strcpy(argv[i], "-c");
         }
 
-        if (!is_option (argv[1])) {
+        if (!is_option(argv[1])) {
                 server_address = argv[1];
                 argv[1] = argv[0];
                 argv = &argv[1];
                 argc--;
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
-                                 longopts, &option);
+        int option_char;
+        bool escape = false;
+        while (true) {
+                int option = 0;
+                option_char = getopt_long(argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_char == -1 || option_char == EOF || option_char == 1)
                         break;
 
-                switch (c) {
-                case '?':                 /* print short usage statement if args not parsable */
-                        usage5 ();
-                case 'h':                 /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                 /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'v':                 /* verbose mode */
+                switch (option_char) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* verbose mode */
                         flags |= FLAG_VERBOSE;
                         match_flags |= NP_MATCH_VERBOSE;
                         break;
@@ -487,43 +455,43 @@ static int process_arguments (int argc, char **argv) {
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
-                case 'H':                 /* hostname */
+                case 'H': /* hostname */
                         host_specified = true;
                         server_address = optarg;
                         break;
-                case 'c':                 /* critical */
-                        critical_time = strtod (optarg, NULL);
+                case 'c': /* critical */
+                        critical_time = strtod(optarg, NULL);
                         flags |= FLAG_TIME_CRIT;
                         break;
-                case 'j':                 /* hide output */
+                case 'j': /* hide output */
                         flags |= FLAG_HIDE_OUTPUT;
                         break;
-                case 'w':                 /* warning */
-                        warning_time = strtod (optarg, NULL);
+                case 'w': /* warning */
+                        warning_time = strtod(optarg, NULL);
                         flags |= FLAG_TIME_WARN;
                         break;
                 case 'C':
-                        crit_codes = realloc (crit_codes, ++crit_codes_count);
+                        crit_codes = realloc(crit_codes, ++crit_codes_count);
                         crit_codes[crit_codes_count - 1] = optarg;
                         break;
                 case 'W':
-                        warn_codes = realloc (warn_codes, ++warn_codes_count);
+                        warn_codes = realloc(warn_codes, ++warn_codes_count);
                         warn_codes[warn_codes_count - 1] = optarg;
                         break;
-                case 't':                 /* timeout */
-                        if (!is_intpos (optarg))
-                                usage4 (_("Timeout interval must be a positive integer"));
+                case 't': /* timeout */
+                        if (!is_intpos(optarg))
+                                usage4(_("Timeout interval must be a positive integer"));
                         else
-                                socket_timeout = atoi (optarg);
+                                socket_timeout = atoi(optarg);
                         break;
-                case 'p':                 /* port */
-                        if (!is_intpos (optarg))
-                                usage4 (_("Port must be a positive integer"));
+                case 'p': /* port */
+                        if (!is_intpos(optarg))
+                                usage4(_("Port must be a positive integer"));
                         else
-                                server_port = atoi (optarg);
+                                server_port = atoi(optarg);
                         break;
                 case 'E':
                         escape = true;
@@ -537,16 +505,16 @@ static int process_arguments (int argc, char **argv) {
                 case 'e': /* expect string (may be repeated) */
                         match_flags &= ~NP_MATCH_EXACT;
                         if (server_expect_count == 0)
-                                server_expect = malloc (sizeof (char *) * (++server_expect_count));
+                                server_expect = malloc(sizeof(char *) * (++server_expect_count));
                         else
-                                server_expect = realloc (server_expect, sizeof (char *) * (++server_expect_count));
+                                server_expect = realloc(server_expect, sizeof(char *) * (++server_expect_count));
                         server_expect[server_expect_count - 1] = optarg;
                         break;
                 case 'm':
-                        if (!is_intpos (optarg))
-                                usage4 (_("Maxbytes must be a positive integer"));
+                        if (!is_intpos(optarg))
+                                usage4(_("Maxbytes must be a positive integer"));
                         else
-                                maxbytes = strtol (optarg, NULL, 0);
+                                maxbytes = strtol(optarg, NULL, 0);
                         break;
                 case 'q':
                         if (escape)
@@ -555,62 +523,62 @@ static int process_arguments (int argc, char **argv) {
                                 xasprintf(&server_quit, "%s\r\n", optarg);
                         break;
                 case 'r':
-                        if (!strncmp(optarg,"ok",2))
+                        if (!strncmp(optarg, "ok", 2))
                                 econn_refuse_state = STATE_OK;
-                        else if (!strncmp(optarg,"warn",4))
+                        else if (!strncmp(optarg, "warn", 4))
                                 econn_refuse_state = STATE_WARNING;
-                        else if (!strncmp(optarg,"crit",4))
+                        else if (!strncmp(optarg, "crit", 4))
                                 econn_refuse_state = STATE_CRITICAL;
                         else
-                                usage4 (_("Refuse must be one of ok, warn, crit"));
+                                usage4(_("Refuse must be one of ok, warn, crit"));
                         break;
                 case 'M':
-                        if (!strncmp(optarg,"ok",2))
+                        if (!strncmp(optarg, "ok", 2))
                                 expect_mismatch_state = STATE_OK;
-                        else if (!strncmp(optarg,"warn",4))
+                        else if (!strncmp(optarg, "warn", 4))
                                 expect_mismatch_state = STATE_WARNING;
-                        else if (!strncmp(optarg,"crit",4))
+                        else if (!strncmp(optarg, "crit", 4))
                                 expect_mismatch_state = STATE_CRITICAL;
                         else
-                                usage4 (_("Mismatch must be one of ok, warn, crit"));
+                                usage4(_("Mismatch must be one of ok, warn, crit"));
                         break;
                 case 'd':
-                        if (is_intpos (optarg))
-                                delay = atoi (optarg);
+                        if (is_intpos(optarg))
+                                delay = atoi(optarg);
                         else
-                                usage4 (_("Delay must be a positive integer"));
+                                usage4(_("Delay must be a positive integer"));
                         break;
-                case 'D': /* Check SSL cert validity - days 'til certificate expiration */
+                case 'D': { /* Check SSL cert validity - days 'til certificate expiration */
 #ifdef HAVE_SSL
-#  ifdef USE_OPENSSL /* XXX */
-                        if ((temp=strchr(optarg,','))!=NULL) {
-                            *temp='\0';
-                            if (!is_intnonneg (optarg))
-                               usage2 (_("Invalid certificate expiration period"), optarg);
-                            days_till_exp_warn = atoi (optarg);
-                            *temp=',';
-                            temp++;
-                            if (!is_intnonneg (temp))
-                                usage2 (_("Invalid certificate expiration period"), temp);
-                            days_till_exp_crit = atoi (temp);
-                        }
-                        else {
-                            days_till_exp_crit=0;
-                            if (!is_intnonneg (optarg))
-                                usage2 (_("Invalid certificate expiration period"), optarg);
-                            days_till_exp_warn = atoi (optarg);
+#       ifdef USE_OPENSSL /* XXX */
+                        char *temp;
+                        if ((temp = strchr(optarg, ',')) != NULL) {
+                                *temp = '\0';
+                                if (!is_intnonneg(optarg))
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                days_till_exp_warn = atoi(optarg);
+                                *temp = ',';
+                                temp++;
+                                if (!is_intnonneg(temp))
+                                        usage2(_("Invalid certificate expiration period"), temp);
+                                days_till_exp_crit = atoi(temp);
+                        } else {
+                                days_till_exp_crit = 0;
+                                if (!is_intnonneg(optarg))
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                days_till_exp_warn = atoi(optarg);
                         }
                         check_cert = true;
                         flags |= FLAG_SSL;
-                        break;
-#  endif /* USE_OPENSSL */
+                } break;
+#       endif /* USE_OPENSSL */
 #endif
                         /* fallthrough if we don't have ssl */
                 case 'S':
 #ifdef HAVE_SSL
                         flags |= FLAG_SSL;
 #else
-                        die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
+                        die(STATE_UNKNOWN, _("Invalid option - SSL is not available"));
 #endif
                         break;
                 case SNI_OPTION:
@@ -619,7 +587,7 @@ static int process_arguments (int argc, char **argv) {
                         sni_specified = true;
                         sni = optarg;
 #else
-                        die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
+                        die(STATE_UNKNOWN, _("Invalid option - SSL is not available"));
 #endif
                         break;
                 case 'A':
@@ -628,87 +596,81 @@ static int process_arguments (int argc, char **argv) {
                 }
         }
 
-        c = optind;
-        if(!host_specified && c < argc)
-                server_address = strdup (argv[c++]);
+        option_char = optind;
+        if (!host_specified && option_char < argc)
+                server_address = strdup(argv[option_char++]);
 
         if (server_address == NULL)
-                usage4 (_("You must provide a server address"));
+                usage4(_("You must provide a server address"));
         else if (server_address[0] != '/' && !is_host(server_address))
-                die (STATE_CRITICAL, "%s %s - %s: %s\n", SERVICE, state_text(STATE_CRITICAL), _("Invalid hostname, address or socket"), server_address);
+                die(STATE_CRITICAL, "%s %s - %s: %s\n", SERVICE, state_text(STATE_CRITICAL), _("Invalid hostname, address or socket"),
+                        server_address);
 
         return OK;
 }
 
-
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf (_("This plugin tests %s connections with the specified host (or unix socket).\n\n"),
-                SERVICE);
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_HOST_PORT, 'p', "none");
-
-        printf (UT_IPv46);
-
-        printf (" %s\n", "-E, --escape");
-  printf ("    %s\n", _("Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send or quit option"));
-  printf ("    %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
-  printf (" %s\n", "-s, --send=STRING");
-  printf ("    %s\n", _("String to send to the server"));
-  printf (" %s\n", "-e, --expect=STRING");
-  printf ("    %s %s\n", _("String to expect in server response"), _("(may be repeated)"));
-  printf (" %s\n", "-A, --all");
-  printf ("    %s\n", _("All expect strings need to occur in server response. Default is any"));
-  printf (" %s\n", "-q, --quit=STRING");
-  printf ("    %s\n", _("String to send server to initiate a clean close of the connection"));
-  printf (" %s\n", "-r, --refuse=ok|warn|crit");
-  printf ("    %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
-  printf (" %s\n", "-M, --mismatch=ok|warn|crit");
-  printf ("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
-  printf (" %s\n", "-j, --jail");
-  printf ("    %s\n", _("Hide output from TCP socket"));
-  printf (" %s\n", "-m, --maxbytes=INTEGER");
-  printf ("    %s\n", _("Close connection once more than this number of bytes are received"));
-  printf (" %s\n", "-d, --delay=INTEGER");
-  printf ("    %s\n", _("Seconds to wait between sending string and polling for response"));
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf(_("This plugin tests %s connections with the specified host (or unix socket).\n\n"), SERVICE);
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'p', "none");
+
+        printf(UT_IPv46);
+
+        printf(" %s\n", "-E, --escape");
+        printf("    %s\n", _("Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send or quit option"));
+        printf("    %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
+        printf(" %s\n", "-s, --send=STRING");
+        printf("    %s\n", _("String to send to the server"));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s %s\n", _("String to expect in server response"), _("(may be repeated)"));
+        printf(" %s\n", "-A, --all");
+        printf("    %s\n", _("All expect strings need to occur in server response. Default is any"));
+        printf(" %s\n", "-q, --quit=STRING");
+        printf("    %s\n", _("String to send server to initiate a clean close of the connection"));
+        printf(" %s\n", "-r, --refuse=ok|warn|crit");
+        printf("    %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
+        printf(" %s\n", "-M, --mismatch=ok|warn|crit");
+        printf("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
+        printf(" %s\n", "-j, --jail");
+        printf("    %s\n", _("Hide output from TCP socket"));
+        printf(" %s\n", "-m, --maxbytes=INTEGER");
+        printf("    %s\n", _("Close connection once more than this number of bytes are received"));
+        printf(" %s\n", "-d, --delay=INTEGER");
+        printf("    %s\n", _("Seconds to wait between sending string and polling for response"));
 
 #ifdef HAVE_SSL
-        printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
-  printf ("    %s\n", _("1st is #days for warning, 2nd is critical (if not specified - 0)."));
-  printf (" %s\n", "-S, --ssl");
-  printf ("    %s\n", _("Use SSL for the connection."));
-  printf (" %s\n", "--sni=STRING");
-  printf ("    %s\n", _("SSL server_name"));
+        printf(" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
+        printf("    %s\n", _("Minimum number of days a certificate has to be valid."));
+        printf("    %s\n", _("1st is #days for warning, 2nd is critical (if not specified - 0)."));
+        printf(" %s\n", "-S, --ssl");
+        printf("    %s\n", _("Use SSL for the connection."));
+        printf(" %s\n", "--sni=STRING");
+        printf("    %s\n", _("SSL server_name"));
 #endif
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-  printf ("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n",progname);
-  printf ("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
-  printf ("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");
-  printf ("[-D <warn days cert expire>[,<crit days cert expire>]] [-S <use SSL>] [-E]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n", progname);
+        printf("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
+        printf("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");
+        printf("[-D <warn days cert expire>[,<crit days cert expire>]] [-S <use SSL>] [-E]\n");
 }
diff --git a/plugins/check_time.c b/plugins/check_time.c
index f50ea42..d1f5068 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-* 
-* Monitoring check_time plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_time plugin
-* 
-* This plugin will check the time difference with the specified host.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_time plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_time plugin
+ *
+ * This plugin will check the time difference with the specified host.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_time";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -40,55 +40,51 @@ enum {
         TIME_PORT = 37
 };
 
-#define UNIX_EPOCH 2208988800UL
-
-uint32_t raw_server_time;
-unsigned long server_time, diff_time;
-int warning_time = 0;
-bool check_warning_time = false;
-int critical_time = 0;
-bool check_critical_time = false;
-unsigned long warning_diff = 0;
-bool check_warning_diff = false;
-unsigned long critical_diff = 0;
-bool check_critical_diff = false;
-int server_port = TIME_PORT;
-char *server_address = NULL;
-bool use_udp = false;
-
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
-
-int
-main (int argc, char **argv)
-{
-        int sd;
-        int result = STATE_UNKNOWN;
-        time_t conntime;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+#define UNIX_EPOCH 2208988800UL
+
+static uint32_t raw_server_time;
+static unsigned long server_time, diff_time;
+static int warning_time = 0;
+static bool check_warning_time = false;
+static int critical_time = 0;
+static bool check_critical_time = false;
+static unsigned long warning_diff = 0;
+static bool check_warning_diff = false;
+static unsigned long critical_diff = 0;
+static bool check_critical_diff = false;
+static int server_port = TIME_PORT;
+static char *server_address = NULL;
+static bool use_udp = false;
+
+static int process_arguments(int, char **);
+static void print_help(void);
+void print_usage(void);
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
-        time (&start_time);
+        alarm(socket_timeout);
+        time(&start_time);
 
+        int socket;
+        int result = STATE_UNKNOWN;
         /* try to connect to the host at the given port number */
         if (use_udp) {
-                result = my_udp_connect (server_address, server_port, &sd);
+                result = my_udp_connect(server_address, server_port, &socket);
         } else {
-                result = my_tcp_connect (server_address, server_port, &sd);
+                result = my_tcp_connect(server_address, server_port, &socket);
         }
 
         if (result != STATE_OK) {
@@ -98,34 +94,30 @@ main (int argc, char **argv)
                         result = STATE_WARNING;
                 else
                         result = STATE_UNKNOWN;
-                die (result,
-                           _("TIME UNKNOWN - could not connect to server %s, port %d\n"),
-                           server_address, server_port);
+                die(result, _("TIME UNKNOWN - could not connect to server %s, port %d\n"), server_address, server_port);
         }
 
         if (use_udp) {
-                if (send (sd, "", 0, 0) < 0) {
+                if (send(socket, "", 0, 0) < 0) {
                         if (check_critical_time)
                                 result = STATE_CRITICAL;
                         else if (check_warning_time)
                                 result = STATE_WARNING;
                         else
                                 result = STATE_UNKNOWN;
-                        die (result,
-                          _("TIME UNKNOWN - could not send UDP request to server %s, port %d\n"),
-                          server_address, server_port);
+                        die(result, _("TIME UNKNOWN - could not send UDP request to server %s, port %d\n"), server_address, server_port);
                 }
         }
 
         /* watch for the connection string */
-        result = recv (sd, (void *)&raw_server_time, sizeof (raw_server_time), 0);
+        result = recv(socket, (void *)&raw_server_time, sizeof(raw_server_time), 0);
 
         /* close the connection */
-        close (sd);
+        close(socket);
 
         /* reset the alarm */
-        time (&end_time);
-        alarm (0);
+        time(&end_time);
+        alarm(0);
 
         /* return a WARNING status if we couldn't read any data */
         if (result <= 0) {
@@ -135,240 +127,205 @@ main (int argc, char **argv)
                         result = STATE_WARNING;
                 else
                         result = STATE_UNKNOWN;
-                die (result,
-                                                         _("TIME UNKNOWN - no data received from server %s, port %d\n"),
-                                                         server_address, server_port);
+                die(result, _("TIME UNKNOWN - no data received from server %s, port %d\n"), server_address, server_port);
         }
 
         result = STATE_OK;
 
-        conntime = (end_time - start_time);
-        if (check_critical_time&& conntime > critical_time)
+        time_t conntime = (end_time - start_time);
+        if (check_critical_time && conntime > critical_time)
                 result = STATE_CRITICAL;
         else if (check_warning_time && conntime > warning_time)
                 result = STATE_WARNING;
 
         if (result != STATE_OK)
-                die (result, _("TIME %s - %d second response time|%s\n"),
-                     state_text (result), (int)conntime,
-                     perfdata ("time", (long)conntime, "s",
-                               check_warning_time, (long)warning_time,
-                               check_critical_time, (long)critical_time,
-                               true, 0, false, 0));
-
-        server_time = ntohl (raw_server_time) - UNIX_EPOCH;
+                die(result, _("TIME %s - %d second response time|%s\n"), state_text(result), (int)conntime,
+                        perfdata("time", (long)conntime, "s", check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, true, 0,
+                                         false, 0));
+
+        server_time = ntohl(raw_server_time) - UNIX_EPOCH;
         if (server_time > (unsigned long)end_time)
                 diff_time = server_time - (unsigned long)end_time;
         else
                 diff_time = (unsigned long)end_time - server_time;
 
-        if (check_critical_diff&& diff_time > critical_diff)
+        if (check_critical_diff && diff_time > critical_diff)
                 result = STATE_CRITICAL;
-        else if (check_warning_diff&& diff_time > warning_diff)
+        else if (check_warning_diff && diff_time > warning_diff)
                 result = STATE_WARNING;
 
-        printf (_("TIME %s - %lu second time difference|%s %s\n"),
-                state_text (result), diff_time,
-                perfdata ("time", (long)conntime, "s",
-                          check_warning_time, (long)warning_time,
-                          check_critical_time, (long)critical_time,
-                          true, 0, false, 0),
-                perfdata ("offset", diff_time, "s",
-                          check_warning_diff, warning_diff,
-                          check_critical_diff, critical_diff,
-                          true, 0, false, 0));
+        printf(_("TIME %s - %lu second time difference|%s %s\n"), state_text(result), diff_time,
+                   perfdata("time", (long)conntime, "s", check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, true, 0,
+                                        false, 0),
+                   perfdata("offset", diff_time, "s", check_warning_diff, warning_diff, check_critical_diff, critical_diff, true, 0, false, 0));
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"warning-variance", required_argument, 0, 'w'},
-                {"critical-variance", required_argument, 0, 'c'},
-                {"warning-connect", required_argument, 0, 'W'},
-                {"critical-connect", required_argument, 0, 'C'},
-                {"port", required_argument, 0, 'p'},
-                {"udp", no_argument, 0, 'u'},
-                {"timeout", required_argument, 0, 't'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"warning-variance", required_argument, 0, 'w'},
+                                                                           {"critical-variance", required_argument, 0, 'c'},
+                                                                           {"warning-connect", required_argument, 0, 'W'},
+                                                                           {"critical-connect", required_argument, 0, 'C'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"udp", no_argument, 0, 'u'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
-                usage ("\n");
-
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wd", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-cd", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-W");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-C");
+                usage("\n");
+
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0)
+                        strcpy(argv[i], "-t");
+                else if (strcmp("-wd", argv[i]) == 0)
+                        strcpy(argv[i], "-w");
+                else if (strcmp("-cd", argv[i]) == 0)
+                        strcpy(argv[i], "-c");
+                else if (strcmp("-wt", argv[i]) == 0)
+                        strcpy(argv[i], "-W");
+                else if (strcmp("-ct", argv[i]) == 0)
+                        strcpy(argv[i], "-C");
         }
 
+        int option_char;
         while (true) {
-                c = getopt_long (argc, argv, "hVH:w:c:W:C:p:t:u", longopts,
-                                                                         &option);
+                int option = 0;
+                option_char = getopt_long(argc, argv, "hVH:w:c:W:C:p:t:u", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case '?':                                                                       /* print short usage statement if args not parsable */
-                        usage5 ();
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'H':                                                                       /* hostname */
-                        if (!is_host (optarg))
-                                usage2 (_("Invalid hostname/address"), optarg);
+                switch (option_char) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'H': /* hostname */
+                        if (!is_host(optarg))
+                                usage2(_("Invalid hostname/address"), optarg);
                         server_address = optarg;
                         break;
-                case 'w':                                                                       /* warning-variance */
-                        if (is_intnonneg (optarg)) {
-                                warning_diff = strtoul (optarg, NULL, 10);
+                case 'w': /* warning-variance */
+                        if (is_intnonneg(optarg)) {
+                                warning_diff = strtoul(optarg, NULL, 10);
                                 check_warning_diff = true;
-                        }
-                        else if (strspn (optarg, "0123456789:,") > 0) {
-                                if (sscanf (optarg, "%lu%*[:,]%d", &warning_diff, &warning_time) == 2) {
+                        } else if (strspn(optarg, "0123456789:,") > 0) {
+                                if (sscanf(optarg, "%lu%*[:,]%d", &warning_diff, &warning_time) == 2) {
                                         check_warning_diff = true;
                                         check_warning_time = true;
+                                } else {
+                                        usage4(_("Warning thresholds must be a positive integer"));
                                 }
-                                else {
-                                        usage4 (_("Warning thresholds must be a positive integer"));
-                                }
-                        }
-                        else {
-                                usage4 (_("Warning threshold must be a positive integer"));
+                        } else {
+                                usage4(_("Warning threshold must be a positive integer"));
                         }
                         break;
-                case 'c':                                                                       /* critical-variance */
-                        if (is_intnonneg (optarg)) {
-                                critical_diff = strtoul (optarg, NULL, 10);
+                case 'c': /* critical-variance */
+                        if (is_intnonneg(optarg)) {
+                                critical_diff = strtoul(optarg, NULL, 10);
                                 check_critical_diff = true;
-                        }
-                        else if (strspn (optarg, "0123456789:,") > 0) {
-                                if (sscanf (optarg, "%lu%*[:,]%d", &critical_diff, &critical_time) ==
-                                                2) {
+                        } else if (strspn(optarg, "0123456789:,") > 0) {
+                                if (sscanf(optarg, "%lu%*[:,]%d", &critical_diff, &critical_time) == 2) {
                                         check_critical_diff = true;
                                         check_critical_time = true;
+                                } else {
+                                        usage4(_("Critical thresholds must be a positive integer"));
                                 }
-                                else {
-                                        usage4 (_("Critical thresholds must be a positive integer"));
-                                }
-                        }
-                        else {
-                                usage4 (_("Critical threshold must be a positive integer"));
+                        } else {
+                                usage4(_("Critical threshold must be a positive integer"));
                         }
                         break;
-                case 'W':                                                                       /* warning-connect */
-                        if (!is_intnonneg (optarg))
-                                usage4 (_("Warning threshold must be a positive integer"));
+                case 'W': /* warning-connect */
+                        if (!is_intnonneg(optarg))
+                                usage4(_("Warning threshold must be a positive integer"));
                         else
-                                warning_time = atoi (optarg);
+                                warning_time = atoi(optarg);
                         check_warning_time = true;
                         break;
-                case 'C':                                                                       /* critical-connect */
-                        if (!is_intnonneg (optarg))
-                                usage4 (_("Critical threshold must be a positive integer"));
+                case 'C': /* critical-connect */
+                        if (!is_intnonneg(optarg))
+                                usage4(_("Critical threshold must be a positive integer"));
                         else
-                                critical_time = atoi (optarg);
+                                critical_time = atoi(optarg);
                         check_critical_time = true;
                         break;
-                case 'p':                                                                       /* port */
-                        if (!is_intnonneg (optarg))
-                                usage4 (_("Port must be a positive integer"));
+                case 'p': /* port */
+                        if (!is_intnonneg(optarg))
+                                usage4(_("Port must be a positive integer"));
                         else
-                                server_port = atoi (optarg);
+                                server_port = atoi(optarg);
                         break;
-                case 't':                                                                       /* timeout */
-                        if (!is_intnonneg (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                case 't': /* timeout */
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
                         else
-                                socket_timeout = atoi (optarg);
+                                socket_timeout = atoi(optarg);
                         break;
-                case 'u':                                                                       /* udp */
+                case 'u': /* udp */
                         use_udp = true;
                 }
         }
 
-        c = optind;
+        option_char = optind;
         if (server_address == NULL) {
-                if (argc > c) {
-                        if (!is_host (argv[c]))
-                                usage2 (_("Invalid hostname/address"), optarg);
-                        server_address = argv[c];
-                }
-                else {
-                        usage4 (_("Hostname was not supplied"));
+                if (argc > option_char) {
+                        if (!is_host(argv[option_char]))
+                                usage2(_("Invalid hostname/address"), optarg);
+                        server_address = argv[option_char];
+                } else {
+                        usage4(_("Hostname was not supplied"));
                 }
         }
 
         return OK;
 }
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", TIME_PORT);
+        xasprintf(&myport, "%d", TIME_PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin will check the time on the specified host."));
+        printf("%s\n", _("This plugin will check the time on the specified host."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (" %s\n", "-u, --udp");
-  printf ("   %s\n", _("Use UDP to connect, not TCP"));
-  printf (" %s\n", "-w, --warning-variance=INTEGER");
-  printf ("   %s\n", _("Time difference (sec.) necessary to result in a warning status"));
-  printf (" %s\n", "-c, --critical-variance=INTEGER");
-  printf ("   %s\n", _("Time difference (sec.) necessary to result in a critical status"));
-  printf (" %s\n", "-W, --warning-connect=INTEGER");
-  printf ("   %s\n", _("Response time (sec.) necessary to result in warning status"));
-  printf (" %s\n", "-C, --critical-connect=INTEGER");
-  printf ("   %s\n", _("Response time (sec.) necessary to result in critical status"));
+        printf(" %s\n", "-u, --udp");
+        printf("   %s\n", _("Use UDP to connect, not TCP"));
+        printf(" %s\n", "-w, --warning-variance=INTEGER");
+        printf("   %s\n", _("Time difference (sec.) necessary to result in a warning status"));
+        printf(" %s\n", "-c, --critical-variance=INTEGER");
+        printf("   %s\n", _("Time difference (sec.) necessary to result in a critical status"));
+        printf(" %s\n", "-W, --warning-connect=INTEGER");
+        printf("   %s\n", _("Response time (sec.) necessary to result in warning status"));
+        printf(" %s\n", "-C, --critical-connect=INTEGER");
+        printf("   %s\n", _("Response time (sec.) necessary to result in critical status"));
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n",progname);
-  printf (" [-W connect_time] [-C connect_time] [-t timeout]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n", progname);
+        printf(" [-W connect_time] [-C connect_time] [-t timeout]\n");
 }
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index f60c0e9..adb7ab8 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -40,7 +40,9 @@ const char *email = "devel@monitoring-plugins.org";
 #include "netutils.h"
 #include "utils.h"
 
-enum { PORT = 3493 };
+enum {
+        PORT = 3493
+};
 
 #define UPS_NONE      0  /* no supported options */
 #define UPS_UTILITY   1  /* supports utility line    */
@@ -66,7 +68,9 @@ enum { PORT = 3493 };
 #define UPSSTATUS_UNKNOWN 4096
 #define UPSSTATUS_ALARM   8192
 
-enum { NOSUCHVAR = ERROR - 1 };
+enum {
+        NOSUCHVAR = ERROR - 1
+};
 
 typedef struct ups_config {
         unsigned int server_port;
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 89b9536..f1e1c39 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -1,71 +1,69 @@
 /*****************************************************************************
-*
-* Monitoring check_users plugin
-*
-* License: GPL
-* Copyright (c) 2000-2012 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_users plugin
-*
-* This plugin checks the number of users currently logged in on the local
-* system and generates an error if the number exceeds the thresholds
-* specified.
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_users plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_users plugin
+ *
+ * This plugin checks the number of users currently logged in on the local
+ * system and generates an error if the number exceeds the thresholds
+ * specified.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_users";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 
 #if HAVE_WTSAPI32_H
-# include <windows.h>
-# include <wtsapi32.h>
-# undef ERROR
-# define ERROR -1
+#       include <windows.h>
+#       include <wtsapi32.h>
+#       undef ERROR
+#       define ERROR -1
 #elif HAVE_UTMPX_H
-# include <utmpx.h>
+#       include <utmpx.h>
 #else
-# include "popen.h"
+#       include "popen.h"
 #endif
 
 #ifdef HAVE_LIBSYSTEMD
-#include <systemd/sd-daemon.h>
-#include <systemd/sd-login.h>
+#       include <systemd/sd-daemon.h>
+#       include <systemd/sd-login.h>
 #endif
 
-#define possibly_set(a,b) ((a) == 0 ? (b) : 0)
+#define possibly_set(a, b) ((a) == 0 ? (b) : 0)
 
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int, char **);
+static void print_help(void);
+void print_usage(void);
 
-char *warning_range = NULL;
-char *critical_range = NULL;
-thresholds *thlds = NULL;
+static char *warning_range = NULL;
+static char *critical_range = NULL;
+static thresholds *thlds = NULL;
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int users = -1;
         int result = STATE_UNKNOWN;
 #if HAVE_WTSAPI32_H
@@ -78,74 +76,71 @@ main (int argc, char **argv)
         char input_buffer[MAX_INPUT_BUFFER];
 #endif
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv = np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
         users = 0;
 
 #ifdef HAVE_LIBSYSTEMD
-        if (sd_booted () > 0)
-                users = sd_get_sessions (NULL);
+        if (sd_booted() > 0)
+                users = sd_get_sessions(NULL);
         else {
 #endif
 #if HAVE_WTSAPI32_H
-        if (!WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE,
-          0, 1, &wtsinfo, &wtscount)) {
-                printf(_("Could not enumerate RD sessions: %d\n"), GetLastError());
-                return STATE_UNKNOWN;
-        }
+                if (!WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE, 0, 1, &wtsinfo, &wtscount)) {
+                        printf(_("Could not enumerate RD sessions: %d\n"), GetLastError());
+                        return STATE_UNKNOWN;
+                }
 
-        for (index = 0; index < wtscount; index++) {
-                LPTSTR username;
-                DWORD size;
-                int len;
+                for (index = 0; index < wtscount; index++) {
+                        LPTSTR username;
+                        DWORD size;
+                        int len;
 
-                if (!WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE,
-                  wtsinfo[index].SessionId, WTSUserName, &username, &size))
-                        continue;
+                        if (!WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE, wtsinfo[index].SessionId, WTSUserName, &username, &size))
+                                continue;
 
-                len = lstrlen(username);
+                        len = lstrlen(username);
 
-                WTSFreeMemory(username);
+                        WTSFreeMemory(username);
 
-                if (len == 0)
-                        continue;
+                        if (len == 0)
+                                continue;
 
-                if (wtsinfo[index].State == WTSActive ||
-                  wtsinfo[index].State == WTSDisconnected)
-                        users++;
-        }
+                        if (wtsinfo[index].State == WTSActive || wtsinfo[index].State == WTSDisconnected)
+                                users++;
+                }
 
-        WTSFreeMemory(wtsinfo);
+                WTSFreeMemory(wtsinfo);
 #elif HAVE_UTMPX_H
         /* get currently logged users from utmpx */
-        setutxent ();
+        setutxent();
 
-        while ((putmpx = getutxent ()) != NULL)
+        while ((putmpx = getutxent()) != NULL)
                 if (putmpx->ut_type == USER_PROCESS)
                         users++;
 
-        endutxent ();
+        endutxent();
 #else
         /* run the command */
-        child_process = spopen (WHO_COMMAND);
+        child_process = spopen(WHO_COMMAND);
         if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), WHO_COMMAND);
+                printf(_("Could not open pipe: %s\n"), WHO_COMMAND);
                 return STATE_UNKNOWN;
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL)
-                printf (_("Could not open stderr for %s\n"), WHO_COMMAND);
+                printf(_("Could not open stderr for %s\n"), WHO_COMMAND);
 
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
                 /* increment 'users' on all lines except total user count */
                 if (input_buffer[0] != '#') {
                         users++;
@@ -153,18 +148,18 @@ main (int argc, char **argv)
                 }
 
                 /* get total logged in users */
-                if (sscanf (input_buffer, _("# users=%d"), &users) == 1)
+                if (sscanf(input_buffer, _("# users=%d"), &users) == 1)
                         break;
         }
 
         /* check STDERR */
-        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
-                result = possibly_set (result, STATE_UNKNOWN);
-        (void) fclose (child_stderr);
+        if (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
+                result = possibly_set(result, STATE_UNKNOWN);
+        (void)fclose(child_stderr);
 
         /* close the pipe */
-        if (spclose (child_process))
-                result = possibly_set (result, STATE_UNKNOWN);
+        if (spclose(child_process))
+                result = possibly_set(result, STATE_UNKNOWN);
 #endif
 #ifdef HAVE_LIBSYSTEMD
         }
@@ -174,109 +169,99 @@ main (int argc, char **argv)
         result = get_status((double)users, thlds);
 
         if (result == STATE_UNKNOWN)
-                printf ("%s\n", _("Unable to read output"));
+                printf("%s\n", _("Unable to read output"));
         else {
-                printf (_("USERS %s - %d users currently logged in |%s\n"),
-                                state_text(result), users,
-                                sperfdata_int("users", users, "", warning_range,
-                                                        critical_range, true, 0, false, 0));
+                printf(_("USERS %s - %d users currently logged in |%s\n"), state_text(result), users,
+                           sperfdata_int("users", users, "", warning_range, critical_range, true, 0, false, 0));
         }
 
         return result;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-        int option = 0;
-        static struct option longopts[] = {
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+int process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
-                usage ("\n");
+                usage("\n");
 
+        int option_char;
         while (true) {
-                c = getopt_long (argc, argv, "+hVvc:w:", longopts, &option);
+                int option = 0;
+                option_char = getopt_long(argc, argv, "+hVvc:w:", longopts, &option);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_char == -1 || option_char == EOF || option_char == 1)
                         break;
 
-                switch (c) {
-                case '?':                                                                       /* print short usage statement if args not parsable */
-                        usage5 ();
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'c':                                                                       /* critical */
+                switch (option_char) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'c': /* critical */
                         critical_range = optarg;
                         break;
-                case 'w':                                                                       /* warning */
+                case 'w': /* warning */
                         warning_range = optarg;
                         break;
                 }
         }
 
-        c = optind;
+        option_char = optind;
 
-        if (warning_range == NULL && argc > c)
-                warning_range = argv[c++];
+        if (warning_range == NULL && argc > option_char)
+                warning_range = argv[option_char++];
 
-        if (critical_range == NULL && argc > c)
-                critical_range = argv[c++];
+        if (critical_range == NULL && argc > option_char)
+                critical_range = argv[option_char++];
 
         /* this will abort in case of invalid ranges */
-        set_thresholds (&thlds, warning_range, critical_range);
+        set_thresholds(&thlds, warning_range, critical_range);
 
         if (!thlds->warning) {
-                usage4 (_("Warning threshold must be a valid range expression"));
+                usage4(_("Warning threshold must be a valid range expression"));
         }
 
         if (!thlds->critical) {
-                usage4 (_("Critical threshold must be a valid range expression"));
+                usage4(_("Critical threshold must be a valid range expression"));
         }
 
         return OK;
 }
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin checks the number of users currently logged in on the local"));
-        printf ("%s\n", _("system and generates an error if the number exceeds the thresholds specified."));
+        printf("%s\n", _("This plugin checks the number of users currently logged in on the local"));
+        printf("%s\n", _("system and generates an error if the number exceeds the thresholds specified."));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (" %s\n", "-w, --warning=RANGE_EXPRESSION");
-        printf ("    %s\n", _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION"));
-        printf (" %s\n", "-c, --critical=RANGE_EXPRESSION");
-        printf ("    %s\n", _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION"));
+        printf(" %s\n", "-w, --warning=RANGE_EXPRESSION");
+        printf("    %s\n", _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION"));
+        printf(" %s\n", "-c, --critical=RANGE_EXPRESSION");
+        printf("    %s\n", _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION"));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -w <users> -c <users>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -w <users> -c <users>\n", progname);
 }
diff --git a/plugins/negate.c b/plugins/negate.c
index c5fe7e1..7e52fe6 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring negate plugin
-* 
-* License: GPL
-* Copyright (c) 2002-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the negate plugin
-* 
-* Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).
-* Can also perform custom state switching.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring negate plugin
+ *
+ * License: GPL
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the negate plugin
+ *
+ * Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).
+ * Can also perform custom state switching.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "negate";
-const char *copyright = "2002-2008";
+const char *copyright = "2002-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #define DEFAULT_TIMEOUT 11
@@ -41,13 +41,11 @@ const char *email = "devel@monitoring-plugins.org";
 
 #include <ctype.h>
 
-/* char *command_line; */
-
-static const char **process_arguments (int, char **);
-void validate_arguments (char **);
-void print_help (void);
-void print_usage (void);
-bool subst_text = false;
+static const char **process_arguments(int /*argc*/, char ** /*argv*/);
+static void validate_arguments(char ** /*command_line*/);
+static void print_help(void);
+void print_usage(void);
+static bool subst_text = false;
 
 static int state[4] = {
         STATE_OK,
@@ -56,185 +54,165 @@ static int state[4] = {
         STATE_UNKNOWN,
 };
 
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char *sub;
-        char **command_line;
-        output chld_out, chld_err;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         timeout_interval = DEFAULT_TIMEOUT;
 
-        command_line = (char **) process_arguments (argc, argv);
+        char **command_line = (char **)process_arguments(argc, argv);
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR)
-                die (STATE_UNKNOWN, _("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR)
+                die(STATE_UNKNOWN, _("Cannot catch SIGALRM"));
 
-        (void) alarm ((unsigned) timeout_interval);
+        (void)alarm((unsigned)timeout_interval);
+
+        int result = STATE_UNKNOWN;
+        output chld_out;
+        output chld_err;
 
         /* catch when the command is quoted */
-        if(command_line[1] == NULL) {
-                result = cmd_run (command_line[0], &chld_out, &chld_err, 0);
+        if (command_line[1] == NULL) {
+                result = cmd_run(command_line[0], &chld_out, &chld_err, 0);
         } else {
-                result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
+                result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
         }
         if (chld_err.lines > 0) {
                 for (size_t i = 0; i < chld_err.lines; i++) {
-                        fprintf (stderr, "%s\n", chld_err.line[i]);
+                        fprintf(stderr, "%s\n", chld_err.line[i]);
                 }
         }
 
         /* Return UNKNOWN or worse if no output is returned */
         if (chld_out.lines == 0)
-                die (max_state_alt (result, STATE_UNKNOWN), _("No data returned from command\n"));
+                die(max_state_alt(result, STATE_UNKNOWN), _("No data returned from command\n"));
 
+        char *sub;
         for (size_t i = 0; i < chld_out.lines; i++) {
-                if (subst_text && result >= 0 && result <= 4 && result != state[result])  {
+                if (subst_text && result >= 0 && result <= 4 && result != state[result]) {
                         /* Loop over each match found */
-                        while ((sub = strstr (chld_out.line[i], state_text (result)))) {
+                        while ((sub = strstr(chld_out.line[i], state_text(result)))) {
                                 /* Terminate the first part and skip over the string we'll substitute */
                                 *sub = '\0';
-                                sub += strlen (state_text (result));
+                                sub += strlen(state_text(result));
                                 /* then put everything back together */
-                                xasprintf (&chld_out.line[i], "%s%s%s", chld_out.line[i], state_text (state[result]), sub);
+                                xasprintf(&chld_out.line[i], "%s%s%s", chld_out.line[i], state_text(state[result]), sub);
                         }
                 }
-                printf ("%s\n", chld_out.line[i]);
+                printf("%s\n", chld_out.line[i]);
         }
 
         if (result >= 0 && result <= 4) {
-                exit (state[result]);
+                exit(state[result]);
         } else {
-                exit (result);
+                exit(result);
         }
 }
 
-
 /* process command-line arguments */
-static const char **
-process_arguments (int argc, char **argv)
-{
-        int c;
+static const char **process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"help", no_argument, 0, 'h'},           {"version", no_argument, 0, 'V'},
+                                                                           {"timeout", required_argument, 0, 't'},  {"timeout-result", required_argument, 0, 'T'},
+                                                                           {"ok", required_argument, 0, 'o'},       {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'}, {"unknown", required_argument, 0, 'u'},
+                                                                           {"substitute", no_argument, 0, 's'},     {0, 0, 0, 0}};
+
         bool permute = true;
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "+hVt:T:o:w:c:u:s", longopts, &option);
 
-        int option = 0;
-        static struct option longopts[] = {
-                {"help", no_argument, 0, 'h'},
-                {"version", no_argument, 0, 'V'},
-                {"timeout", required_argument, 0, 't'},
-                {"timeout-result", required_argument, 0, 'T'},
-                {"ok", required_argument, 0, 'o'},
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"unknown", required_argument, 0, 'u'},
-                {"substitute", no_argument, 0, 's'},
-                {0, 0, 0, 0}
-        };
-
-        while (1) {
-                c = getopt_long (argc, argv, "+hVt:T:o:w:c:u:s", longopts, &option);
-
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case '?':     /* help */
-                        usage5 ();
+                switch (option_char) {
+                case '?': /* help */
+                        usage5();
                         break;
-                case 'h':     /* help */
-                        print_help ();
-                        exit (EXIT_SUCCESS);
+                case 'h': /* help */
+                        print_help();
+                        exit(EXIT_SUCCESS);
                         break;
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (EXIT_SUCCESS);
-                case 't':     /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(EXIT_SUCCESS);
+                case 't': /* timeout period */
+                        if (!is_integer(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
                         else
-                                timeout_interval = atoi (optarg);
+                                timeout_interval = atoi(optarg);
                         break;
-                case 'T':     /* Result to return on timeouts */
+                case 'T': /* Result to return on timeouts */
                         if ((timeout_state = mp_translate_state(optarg)) == ERROR)
-                                usage4 (_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                                usage4(_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         break;
-                case 'o':     /* replacement for OK */
+                case 'o': /* replacement for OK */
                         if ((state[STATE_OK] = mp_translate_state(optarg)) == ERROR)
-                                usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                                usage4(_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = false;
                         break;
 
-                case 'w':     /* replacement for WARNING */
+                case 'w': /* replacement for WARNING */
                         if ((state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR)
-                                usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                                usage4(_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = false;
                         break;
-                case 'c':     /* replacement for CRITICAL */
+                case 'c': /* replacement for CRITICAL */
                         if ((state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR)
-                                usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                                usage4(_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = false;
                         break;
-                case 'u':     /* replacement for UNKNOWN */
+                case 'u': /* replacement for UNKNOWN */
                         if ((state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR)
-                                usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                                usage4(_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = false;
                         break;
-                case 's':     /* Substitute status text */
+                case 's': /* Substitute status text */
                         subst_text = true;
                         break;
                 }
         }
 
-        validate_arguments (&argv[optind]);
+        validate_arguments(&argv[optind]);
 
         if (permute) { /* No [owcu] switch specified, default to this */
                 state[STATE_OK] = STATE_CRITICAL;
                 state[STATE_CRITICAL] = STATE_OK;
         }
 
-        return (const char **) &argv[optind];
+        return (const char **)&argv[optind];
 }
 
-
-void
-validate_arguments (char **command_line)
-{
+void validate_arguments(char **command_line) {
         if (command_line[0] == NULL)
-                usage4 (_("Could not parse arguments"));
+                usage4(_("Could not parse arguments"));
 
-        if (strncmp(command_line[0],"/",1) != 0 && strncmp(command_line[0],"./",2) != 0)
-                usage4 (_("Require path to command"));
+        if (strncmp(command_line[0], "/", 1) != 0 && strncmp(command_line[0], "./", 2) != 0)
+                usage4(_("Require path to command"));
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+        printf(COPYRIGHT, copyright, email);
 
-        printf (COPYRIGHT, copyright, email);
+        printf("%s\n", _("Negates only the return code of a plugin (returns OK for CRITICAL and vice-versa) by default."));
+        printf("%s\n", _("Additional switches can be used to control:\n"));
+        printf("\t  - which state becomes what\n");
+        printf("\t  - changing the plugin output text to match the return code");
 
-        printf ("%s\n", _("Negates only the return code of a plugin (returns OK for CRITICAL and vice-versa) by default."));
-        printf ("%s\n", _("Additional switches can be used to control:\n"));
-        printf ("\t  - which state becomes what\n");
-        printf ("\t  - changing the plugin output text to match the return code");
+        printf("\n\n");
 
-        printf ("\n\n");
+        print_usage();
 
-        print_usage ();
+        printf(UT_HELP_VRSN);
 
-        printf (UT_HELP_VRSN);
-
-        printf (UT_PLUG_TIMEOUT, timeout_interval);
-        printf ("    %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
-        printf (" -T, --timeout-result=STATUS\n");
-        printf ("    %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n"));
+        printf(UT_PLUG_TIMEOUT, timeout_interval);
+        printf("    %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
+        printf(" -T, --timeout-result=STATUS\n");
+        printf("    %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n"));
 
         printf(" -o, --ok=STATUS\n");
         printf(" -w, --warning=STATUS\n");
@@ -246,31 +224,27 @@ print_help (void)
         printf(" -s, --substitute\n");
         printf(_("    Substitute output text as well. Will only substitute text in CAPITALS\n"));
 
-        printf ("\n");
-        printf ("%s\n", _("Examples:"));
-        printf (" %s\n", "negate /usr/local/nagios/libexec/check_ping -H host");
-        printf ("    %s\n", _("Run check_ping and invert result. Must use full path to plugin"));
-        printf (" %s\n", "negate -w OK -c UNKNOWN /usr/local/nagios/libexec/check_procs -a 'vi negate.c'");
-        printf ("    %s\n", _("This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"));
-        printf ("\n");
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("This plugin is a wrapper to take the output of another plugin and invert it."));
-        printf (" %s\n", _("The full path of the plugin must be provided."));
-        printf (" %s\n", _("If the wrapped plugin returns OK, the wrapper will return CRITICAL."));
-        printf (" %s\n", _("If the wrapped plugin returns CRITICAL, the wrapper will return OK."));
-        printf (" %s\n", _("Otherwise, the output state of the wrapped plugin is unchanged."));
-        printf ("\n");
-        printf (" %s\n", _("Using timeout-result, it is possible to override the timeout behaviour or a"));
-        printf (" %s\n", _("plugin by setting the negate timeout a bit lower."));
-
-        printf (UT_SUPPORT);
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "negate /usr/local/nagios/libexec/check_ping -H host");
+        printf("    %s\n", _("Run check_ping and invert result. Must use full path to plugin"));
+        printf(" %s\n", "negate -w OK -c UNKNOWN /usr/local/nagios/libexec/check_procs -a 'vi negate.c'");
+        printf("    %s\n", _("This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"));
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("This plugin is a wrapper to take the output of another plugin and invert it."));
+        printf(" %s\n", _("The full path of the plugin must be provided."));
+        printf(" %s\n", _("If the wrapped plugin returns OK, the wrapper will return CRITICAL."));
+        printf(" %s\n", _("If the wrapped plugin returns CRITICAL, the wrapper will return OK."));
+        printf(" %s\n", _("Otherwise, the output state of the wrapped plugin is unchanged."));
+        printf("\n");
+        printf(" %s\n", _("Using timeout-result, it is possible to override the timeout behaviour or a"));
+        printf(" %s\n", _("plugin by setting the negate timeout a bit lower."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s [-t timeout] [-Towcu STATE] [-s] <definition of wrapped plugin>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-t timeout] [-Towcu STATE] [-s] <definition of wrapped plugin>\n", progname);
 }
diff --git a/plugins/netutils.c b/plugins/netutils.c
index c6af248..ee81912 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -1,31 +1,31 @@
 /*****************************************************************************
-* 
-* Monitoring Plugins network utilities
-* 
-* License: GPL
-* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains commons functions used in many of the plugins.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring Plugins network utilities
+ *
+ * License: GPL
+ * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2003-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains commons functions used in many of the plugins.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "netutils.h"
@@ -42,25 +42,19 @@ int address_family = AF_INET;
 #endif
 
 /* handles socket timeouts */
-void
-socket_timeout_alarm_handler (int sig)
-{
+void socket_timeout_alarm_handler(int sig) {
         if (sig == SIGALRM)
-                printf (_("%s - Socket timeout after %d seconds\n"), state_text(socket_timeout_state),  socket_timeout);
+                printf(_("%s - Socket timeout after %d seconds\n"), state_text(socket_timeout_state), socket_timeout);
         else
-                printf (_("%s - Abnormal timeout after %d seconds\n"), state_text(socket_timeout_state), socket_timeout);
+                printf(_("%s - Abnormal timeout after %d seconds\n"), state_text(socket_timeout_state), socket_timeout);
 
-        exit (socket_timeout_state);
+        exit(socket_timeout_state);
 }
 
-
 /* connects to a host on a specified tcp port, sends a string, and gets a
          response. loops on select-recv until timeout or eof to get all of a
          multi-packet answer */
-int
-process_tcp_request2 (const char *server_address, int server_port,
-        const char *send_buffer, char *recv_buffer, int recv_size)
-{
+int process_tcp_request2(const char *server_address, int server_port, const char *send_buffer, char *recv_buffer, int recv_size) {
 
         int result;
         int send_result;
@@ -70,13 +64,13 @@ process_tcp_request2 (const char *server_address, int server_port,
         fd_set readfds;
         int recv_length = 0;
 
-        result = np_net_connect (server_address, server_port, &sd, IPPROTO_TCP);
+        result = np_net_connect(server_address, server_port, &sd, IPPROTO_TCP);
         if (result != STATE_OK)
                 return STATE_CRITICAL;
 
-        send_result = send (sd, send_buffer, strlen (send_buffer), 0);
-        if (send_result<0 || (size_t)send_result!=strlen(send_buffer)) {
-                printf ("%s\n", _("Send failed"));
+        send_result = send(sd, send_buffer, strlen(send_buffer), 0);
+        if (send_result < 0 || (size_t)send_result != strlen(send_buffer)) {
+                printf("%s\n", _("Send failed"));
                 result = STATE_WARNING;
         }
 
@@ -85,38 +79,32 @@ process_tcp_request2 (const char *server_address, int server_port,
                    minus one for data from the host */
                 tv.tv_sec = socket_timeout - 1;
                 tv.tv_usec = 0;
-                FD_ZERO (&readfds);
-                FD_SET (sd, &readfds);
-                select (sd + 1, &readfds, NULL, NULL, &tv);
+                FD_ZERO(&readfds);
+                FD_SET(sd, &readfds);
+                select(sd + 1, &readfds, NULL, NULL, &tv);
 
                 /* make sure some data has arrived */
-                if (!FD_ISSET (sd, &readfds)) { /* it hasn't */
+                if (!FD_ISSET(sd, &readfds)) { /* it hasn't */
                         if (!recv_length) {
-                                strcpy (recv_buffer, "");
-                                printf ("%s\n", _("No data was received from host!"));
+                                strcpy(recv_buffer, "");
+                                printf("%s\n", _("No data was received from host!"));
                                 result = STATE_WARNING;
-                        }
-                        else {                                                                          /* this one failed, but previous ones worked */
+                        } else { /* this one failed, but previous ones worked */
                                 recv_buffer[recv_length] = 0;
                         }
                         break;
-                }
-                else {                                                                                  /* it has */
-                        recv_result =
-                                recv (sd, recv_buffer + recv_length,
-                                        (size_t)recv_size - recv_length - 1, 0);
+                } else { /* it has */
+                        recv_result = recv(sd, recv_buffer + recv_length, (size_t)recv_size - recv_length - 1, 0);
                         if (recv_result == -1) {
                                 /* recv failed, bail out */
-                                strcpy (recv_buffer + recv_length, "");
+                                strcpy(recv_buffer + recv_length, "");
                                 result = STATE_WARNING;
                                 break;
-                        }
-                        else if (recv_result == 0) {
+                        } else if (recv_result == 0) {
                                 /* end of file ? */
                                 recv_buffer[recv_length] = 0;
                                 break;
-                        }
-                        else {                                                                          /* we got data! */
+                        } else { /* we got data! */
                                 recv_length += recv_result;
                                 if (recv_length >= recv_size - 1) {
                                         /* buffer full, we're done */
@@ -129,42 +117,35 @@ process_tcp_request2 (const char *server_address, int server_port,
         }
         /* end while(1) */
 
-        close (sd);
+        close(sd);
         return result;
 }
 
-
 /* connects to a host on a specified port, sends a string, and gets a
    response */
-int
-process_request (const char *server_address, int server_port, int proto,
-        const char *send_buffer, char *recv_buffer, int recv_size)
-{
+int process_request(const char *server_address, int server_port, int proto, const char *send_buffer, char *recv_buffer, int recv_size) {
         int result;
         int sd;
 
         result = STATE_OK;
 
-        result = np_net_connect (server_address, server_port, &sd, proto);
+        result = np_net_connect(server_address, server_port, &sd, proto);
         if (result != STATE_OK)
                 return STATE_CRITICAL;
 
-        result = send_request (sd, proto, send_buffer, recv_buffer, recv_size);
+        result = send_request(sd, proto, send_buffer, recv_buffer, recv_size);
 
-        close (sd);
+        close(sd);
 
         return result;
 }
 
-
 /* opens a tcp or udp connection to a remote host or local socket */
-int
-np_net_connect (const char *host_name, int port, int *sd, int proto)
-{
-        /* send back STATE_UNKOWN if there's an error
-           send back STATE_OK if we connect
-           send back STATE_CRITICAL if we can't connect.
-           Let upstream figure out what to send to the user. */
+int np_net_connect(const char *host_name, int port, int *sd, int proto) {
+        /* send back STATE_UNKOWN if there's an error
+           send back STATE_OK if we connect
+           send back STATE_CRITICAL if we can't connect.
+           Let upstream figure out what to send to the user. */
         struct addrinfo hints;
         struct addrinfo *r, *res;
         struct sockaddr_un su;
@@ -176,13 +157,13 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
         socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
 
         /* as long as it doesn't start with a '/', it's assumed a host or ip */
-        if (!is_socket){
-                memset (&hints, 0, sizeof (hints));
+        if (!is_socket) {
+                memset(&hints, 0, sizeof(hints));
                 hints.ai_family = address_family;
                 hints.ai_protocol = proto;
                 hints.ai_socktype = socktype;
 
-                len = strlen (host_name);
+                len = strlen(host_name);
                 /* check for an [IPv6] address (and strip the brackets) */
                 if (len >= 2 && host_name[0] == '[' && host_name[len - 1] == ']') {
                         host_name++;
@@ -190,29 +171,29 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                 }
                 if (len >= sizeof(host))
                         return STATE_UNKNOWN;
-                memcpy (host, host_name, len);
+                memcpy(host, host_name, len);
                 host[len] = '\0';
-                snprintf (port_str, sizeof (port_str), "%d", port);
-                result = getaddrinfo (host, port_str, &hints, &res);
+                snprintf(port_str, sizeof(port_str), "%d", port);
+                result = getaddrinfo(host, port_str, &hints, &res);
 
                 if (result != 0) {
-                        printf ("%s\n", gai_strerror (result));
+                        printf("%s\n", gai_strerror(result));
                         return STATE_UNKNOWN;
                 }
 
                 r = res;
                 while (r) {
                         /* attempt to create a socket */
-                        *sd = socket (r->ai_family, socktype, r->ai_protocol);
+                        *sd = socket(r->ai_family, socktype, r->ai_protocol);
 
                         if (*sd < 0) {
-                                printf ("%s\n", _("Socket creation failed"));
-                                freeaddrinfo (r);
+                                printf("%s\n", _("Socket creation failed"));
+                                freeaddrinfo(r);
                                 return STATE_UNKNOWN;
                         }
 
                         /* attempt to open a connection */
-                        result = connect (*sd, r->ai_addr, r->ai_addrlen);
+                        result = connect(*sd, r->ai_addr, r->ai_addrlen);
 
                         if (result == 0) {
                                 was_refused = false;
@@ -227,21 +208,21 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                                 }
                         }
 
-                        close (*sd);
+                        close(*sd);
                         r = r->ai_next;
                 }
-                freeaddrinfo (res);
+                freeaddrinfo(res);
         }
         /* else the hostname is interpreted as a path to a unix socket */
         else {
-                if(strlen(host_name) >= UNIX_PATH_MAX){
+                if (strlen(host_name) >= UNIX_PATH_MAX) {
                         die(STATE_UNKNOWN, _("Supplied path too long unix domain socket"));
                 }
                 memset(&su, 0, sizeof(su));
                 su.sun_family = AF_UNIX;
                 strncpy(su.sun_path, host_name, UNIX_PATH_MAX);
                 *sd = socket(PF_UNIX, SOCK_STREAM, 0);
-                if(*sd < 0){
+                if (*sd < 0) {
                         die(STATE_UNKNOWN, _("Socket creation failed"));
                 }
                 result = connect(*sd, (struct sockaddr *)&su, sizeof(su));
@@ -259,37 +240,32 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                         if (is_socket)
                                 printf("connect to file socket %s: %s\n", host_name, strerror(errno));
                         else
-                                printf("connect to address %s and port %d: %s\n",
-                                       host_name, port, strerror(errno));
+                                printf("connect to address %s and port %d: %s\n", host_name, port, strerror(errno));
                         return STATE_CRITICAL;
                         break;
                 default: /* it's a logic error if we do not end up in STATE_(OK|WARNING|CRITICAL) */
                         return STATE_UNKNOWN;
                         break;
                 }
-        }
-        else {
+        } else {
                 if (is_socket)
                         printf("connect to file socket %s: %s\n", host_name, strerror(errno));
                 else
-                        printf("connect to address %s and port %d: %s\n",
-                               host_name, port, strerror(errno));
+                        printf("connect to address %s and port %d: %s\n", host_name, port, strerror(errno));
                 return STATE_CRITICAL;
         }
 }
 
-int
-send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size)
-{
+int send_request(int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size) {
         int result = STATE_OK;
         int send_result;
         int recv_result;
         struct timeval tv;
         fd_set readfds;
 
-        send_result = send (sd, send_buffer, strlen (send_buffer), 0);
-        if (send_result<0 || (size_t)send_result!=strlen(send_buffer)) {
-                printf ("%s\n", _("Send failed"));
+        send_result = send(sd, send_buffer, strlen(send_buffer), 0);
+        if (send_result < 0 || (size_t)send_result != strlen(send_buffer)) {
+                printf("%s\n", _("Send failed"));
                 result = STATE_WARNING;
         }
 
@@ -297,26 +273,25 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
            for data from the host */
         tv.tv_sec = socket_timeout - 1;
         tv.tv_usec = 0;
-        FD_ZERO (&readfds);
-        FD_SET (sd, &readfds);
-        select (sd + 1, &readfds, NULL, NULL, &tv);
+        FD_ZERO(&readfds);
+        FD_SET(sd, &readfds);
+        select(sd + 1, &readfds, NULL, NULL, &tv);
 
         /* make sure some data has arrived */
-        if (!FD_ISSET (sd, &readfds)) {
-                strcpy (recv_buffer, "");
-                printf ("%s\n", _("No data was received from host!"));
+        if (!FD_ISSET(sd, &readfds)) {
+                strcpy(recv_buffer, "");
+                printf("%s\n", _("No data was received from host!"));
                 result = STATE_WARNING;
         }
 
         else {
-                recv_result = recv (sd, recv_buffer, (size_t)recv_size - 1, 0);
+                recv_result = recv(sd, recv_buffer, (size_t)recv_size - 1, 0);
                 if (recv_result == -1) {
-                        strcpy (recv_buffer, "");
+                        strcpy(recv_buffer, "");
                         if (proto != IPPROTO_TCP)
-                                printf ("%s\n", _("Receive failed"));
+                                printf("%s\n", _("Receive failed"));
                         result = STATE_WARNING;
-                }
-                else
+                } else
                         recv_buffer[recv_result] = 0;
 
                 /* die returned string */
@@ -325,51 +300,46 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
         return result;
 }
 
-
-bool is_host (const char *address) {
-        if (is_addr (address) || is_hostname (address))
+bool is_host(const char *address) {
+        if (is_addr(address) || is_hostname(address))
                 return (true);
 
         return (false);
 }
 
-void
-host_or_die(const char *str)
-{
-        if(!str || (!is_addr(str) && !is_hostname(str)))
+void host_or_die(const char *str) {
+        if (!str || (!is_addr(str) && !is_hostname(str)))
                 usage_va(_("Invalid hostname/address - %s"), str);
 }
 
-bool is_addr (const char *address) {
+bool is_addr(const char *address) {
 #ifdef USE_IPV6
-        if (address_family == AF_INET && is_inet_addr (address))
+        if (address_family == AF_INET && is_inet_addr(address))
                 return true;
-        else if (address_family == AF_INET6 && is_inet6_addr (address))
+        else if (address_family == AF_INET6 && is_inet6_addr(address))
                 return true;
 #else
-        if (is_inet_addr (address))
+        if (is_inet_addr(address))
                 return (true);
 #endif
 
         return (false);
 }
 
-int
-dns_lookup (const char *in, struct sockaddr_storage *ss, int family)
-{
+int dns_lookup(const char *in, struct sockaddr_storage *ss, int family) {
         struct addrinfo hints;
         struct addrinfo *res;
         int retval;
 
-        memset (&hints, 0, sizeof(struct addrinfo));
+        memset(&hints, 0, sizeof(struct addrinfo));
         hints.ai_family = family;
 
-        retval = getaddrinfo (in, NULL, &hints, &res);
+        retval = getaddrinfo(in, NULL, &hints, &res);
         if (retval != 0)
                 return false;
 
         if (ss != NULL)
-                memcpy (ss, res->ai_addr, res->ai_addrlen);
-        freeaddrinfo (res);
+                memcpy(ss, res->ai_addr, res->ai_addrlen);
+        freeaddrinfo(res);
         return true;
 }
diff --git a/plugins/picohttpparser/picohttpparser.c b/plugins/picohttpparser/picohttpparser.c
index d0bfac6..2ae92d6 100644
--- a/plugins/picohttpparser/picohttpparser.c
+++ b/plugins/picohttpparser/picohttpparser.c
@@ -28,623 +28,610 @@
 #include <stddef.h>
 #include <string.h>
 #ifdef __SSE4_2__
-#ifdef _MSC_VER
-#include <nmmintrin.h>
-#else
-#include <x86intrin.h>
-#endif
+#       ifdef _MSC_VER
+#               include <nmmintrin.h>
+#       else
+#               include <x86intrin.h>
+#       endif
 #endif
 #include "picohttpparser.h"
 
 #if __GNUC__ >= 3
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
+#       define likely(x)   __builtin_expect(!!(x), 1)
+#       define unlikely(x) __builtin_expect(!!(x), 0)
 #else
-#define likely(x) (x)
-#define unlikely(x) (x)
+#       define likely(x)   (x)
+#       define unlikely(x) (x)
 #endif
 
 #ifdef _MSC_VER
-#define ALIGNED(n) _declspec(align(n))
+#       define ALIGNED(n) _declspec(align(n))
 #else
-#define ALIGNED(n) __attribute__((aligned(n)))
+#       define ALIGNED(n) __attribute__((aligned(n)))
 #endif
 
 #define IS_PRINTABLE_ASCII(c) ((unsigned char)(c)-040u < 0137u)
 
-#define CHECK_EOF()                                                                                                                \
-    if (buf == buf_end) {                                                                                                          \
-        *ret = -2;                                                                                                                 \
-        return NULL;                                                                                                               \
-    }
-
-#define EXPECT_CHAR_NO_CHECK(ch)                                                                                                   \
-    if (*buf++ != ch) {                                                                                                            \
-        *ret = -1;                                                                                                                 \
-        return NULL;                                                                                                               \
-    }
-
-#define EXPECT_CHAR(ch)                                                                                                            \
-    CHECK_EOF();                                                                                                                   \
-    EXPECT_CHAR_NO_CHECK(ch);
-
-#define ADVANCE_TOKEN(tok, toklen)                                                                                                 \
-    do {                                                                                                                           \
-        const char *tok_start = buf;                                                                                               \
-        static const char ALIGNED(16) ranges2[16] = "\000\040\177\177";                                                            \
-        int found2;                                                                                                                \
-        buf = findchar_fast(buf, buf_end, ranges2, 4, &found2);                                                                    \
-        if (!found2) {                                                                                                             \
-            CHECK_EOF();                                                                                                           \
-        }                                                                                                                          \
-        while (1) {                                                                                                                \
-            if (*buf == ' ') {                                                                                                     \
-                break;                                                                                                             \
-            } else if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {                                                                      \
-                if ((unsigned char)*buf < '\040' || *buf == '\177') {                                                              \
-                    *ret = -1;                                                                                                     \
-                    return NULL;                                                                                                   \
-                }                                                                                                                  \
-            }                                                                                                                      \
-            ++buf;                                                                                                                 \
-            CHECK_EOF();                                                                                                           \
-        }                                                                                                                          \
-        tok = tok_start;                                                                                                           \
-        toklen = buf - tok_start;                                                                                                  \
-    } while (0)
+#define CHECK_EOF()                                                                                                                        \
+        if (buf == buf_end) {                                                                                                                  \
+                *ret = -2;                                                                                                                         \
+                return NULL;                                                                                                                       \
+        }
+
+#define EXPECT_CHAR_NO_CHECK(ch)                                                                                                           \
+        if (*buf++ != ch) {                                                                                                                    \
+                *ret = -1;                                                                                                                         \
+                return NULL;                                                                                                                       \
+        }
+
+#define EXPECT_CHAR(ch)                                                                                                                    \
+        CHECK_EOF();                                                                                                                           \
+        EXPECT_CHAR_NO_CHECK(ch);
+
+#define ADVANCE_TOKEN(tok, toklen)                                                                                                         \
+        do {                                                                                                                                   \
+                const char *tok_start = buf;                                                                                                       \
+                static const char ALIGNED(16) ranges2[16] = "\000\040\177\177";                                                                    \
+                int found2;                                                                                                                        \
+                buf = findchar_fast(buf, buf_end, ranges2, 4, &found2);                                                                            \
+                if (!found2) {                                                                                                                     \
+                        CHECK_EOF();                                                                                                                   \
+                }                                                                                                                                  \
+                while (1) {                                                                                                                        \
+                        if (*buf == ' ') {                                                                                                             \
+                                break;                                                                                                                     \
+                        } else if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {                                                                              \
+                                if ((unsigned char)*buf < '\040' || *buf == '\177') {                                                                      \
+                                        *ret = -1;                                                                                                             \
+                                        return NULL;                                                                                                           \
+                                }                                                                                                                          \
+                        }                                                                                                                              \
+                        ++buf;                                                                                                                         \
+                        CHECK_EOF();                                                                                                                   \
+                }                                                                                                                                  \
+                tok = tok_start;                                                                                                                   \
+                toklen = buf - tok_start;                                                                                                          \
+        } while (0)
 
 static const char *token_char_map = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                    "\0\1\0\1\1\1\1\1\0\0\1\1\0\1\1\0\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0"
-                                    "\0\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\1\1"
-                                    "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\1\0\1\0"
-                                    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-static const char *findchar_fast(const char *buf, const char *buf_end, const char *ranges, size_t ranges_size, int *found)
-{
-    *found = 0;
+                                                                        "\0\1\0\1\1\1\1\1\0\0\1\1\0\1\1\0\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0"
+                                                                        "\0\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\1\1"
+                                                                        "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\1\0\1\0"
+                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+static const char *findchar_fast(const char *buf, const char *buf_end, const char *ranges, size_t ranges_size, int *found) {
+        *found = 0;
 #if __SSE4_2__
-    if (likely(buf_end - buf >= 16)) {
-        __m128i ranges16 = _mm_loadu_si128((const __m128i *)ranges);
-
-        size_t left = (buf_end - buf) & ~15;
-        do {
-            __m128i b16 = _mm_loadu_si128((const __m128i *)buf);
-            int r = _mm_cmpestri(ranges16, ranges_size, b16, 16, _SIDD_LEAST_SIGNIFICANT | _SIDD_CMP_RANGES | _SIDD_UBYTE_OPS);
-            if (unlikely(r != 16)) {
-                buf += r;
-                *found = 1;
-                break;
-            }
-            buf += 16;
-            left -= 16;
-        } while (likely(left != 0));
-    }
+        if (likely(buf_end - buf >= 16)) {
+                __m128i ranges16 = _mm_loadu_si128((const __m128i *)ranges);
+
+                size_t left = (buf_end - buf) & ~15;
+                do {
+                        __m128i b16 = _mm_loadu_si128((const __m128i *)buf);
+                        int r = _mm_cmpestri(ranges16, ranges_size, b16, 16, _SIDD_LEAST_SIGNIFICANT | _SIDD_CMP_RANGES | _SIDD_UBYTE_OPS);
+                        if (unlikely(r != 16)) {
+                                buf += r;
+                                *found = 1;
+                                break;
+                        }
+                        buf += 16;
+                        left -= 16;
+                } while (likely(left != 0));
+        }
 #else
-    /* suppress unused parameter warning */
-    (void)buf_end;
-    (void)ranges;
-    (void)ranges_size;
+        /* suppress unused parameter warning */
+        (void)buf_end;
+        (void)ranges;
+        (void)ranges_size;
 #endif
-    return buf;
+        return buf;
 }
 
-static const char *get_token_to_eol(const char *buf, const char *buf_end, const char **token, size_t *token_len, int *ret)
-{
-    const char *token_start = buf;
+static const char *get_token_to_eol(const char *buf, const char *buf_end, const char **token, size_t *token_len, int *ret) {
+        const char *token_start = buf;
 
 #ifdef __SSE4_2__
-    static const char ALIGNED(16) ranges1[16] = "\0\010"    /* allow HT */
-                                                "\012\037"  /* allow SP and up to but not including DEL */
-                                                "\177\177"; /* allow chars w. MSB set */
-    int found;
-    buf = findchar_fast(buf, buf_end, ranges1, 6, &found);
-    if (found)
-        goto FOUND_CTL;
+        static const char ALIGNED(16) ranges1[16] = "\0\010"    /* allow HT */
+                                                                                                "\012\037"  /* allow SP and up to but not including DEL */
+                                                                                                "\177\177"; /* allow chars w. MSB set */
+        int found;
+        buf = findchar_fast(buf, buf_end, ranges1, 6, &found);
+        if (found)
+                goto FOUND_CTL;
 #else
-    /* find non-printable char within the next 8 bytes, this is the hottest code; manually inlined */
-    while (likely(buf_end - buf >= 8)) {
-#define DOIT()                                                                                                                     \
-    do {                                                                                                                           \
-        if (unlikely(!IS_PRINTABLE_ASCII(*buf)))                                                                                   \
-            goto NonPrintable;                                                                                                     \
-        ++buf;                                                                                                                     \
-    } while (0)
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-#undef DOIT
-        continue;
-    NonPrintable:
-        if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
-            goto FOUND_CTL;
-        }
-        ++buf;
-    }
+        /* find non-printable char within the next 8 bytes, this is the hottest code; manually inlined */
+        while (likely(buf_end - buf >= 8)) {
+#       define DOIT()                                                                                                                         \
+                do {                                                                                                                               \
+                        if (unlikely(!IS_PRINTABLE_ASCII(*buf)))                                                                                       \
+                                goto NonPrintable;                                                                                                         \
+                        ++buf;                                                                                                                         \
+                } while (0)
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+#       undef DOIT
+                continue;
+        NonPrintable:
+                if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
+                        goto FOUND_CTL;
+                }
+                ++buf;
+        }
 #endif
-    for (;; ++buf) {
-        CHECK_EOF();
-        if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {
-            if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
-                goto FOUND_CTL;
-            }
-        }
-    }
+        for (;; ++buf) {
+                CHECK_EOF();
+                if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {
+                        if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
+                                goto FOUND_CTL;
+                        }
+                }
+        }
 FOUND_CTL:
-    if (likely(*buf == '\015')) {
-        ++buf;
-        EXPECT_CHAR('\012');
-        *token_len = buf - 2 - token_start;
-    } else if (*buf == '\012') {
-        *token_len = buf - token_start;
-        ++buf;
-    } else {
-        *ret = -1;
-        return NULL;
-    }
-    *token = token_start;
-
-    return buf;
+        if (likely(*buf == '\015')) {
+                ++buf;
+                EXPECT_CHAR('\012');
+                *token_len = buf - 2 - token_start;
+        } else if (*buf == '\012') {
+                *token_len = buf - token_start;
+                ++buf;
+        } else {
+                *ret = -1;
+                return NULL;
+        }
+        *token = token_start;
+
+        return buf;
 }
 
-static const char *is_complete(const char *buf, const char *buf_end, size_t last_len, int *ret)
-{
-    int ret_cnt = 0;
-    buf = last_len < 3 ? buf : buf + last_len - 3;
-
-    while (1) {
-        CHECK_EOF();
-        if (*buf == '\015') {
-            ++buf;
-            CHECK_EOF();
-            EXPECT_CHAR('\012');
-            ++ret_cnt;
-        } else if (*buf == '\012') {
-            ++buf;
-            ++ret_cnt;
-        } else {
-            ++buf;
-            ret_cnt = 0;
-        }
-        if (ret_cnt == 2) {
-            return buf;
-        }
-    }
-
-    *ret = -2;
-    return NULL;
+static const char *is_complete(const char *buf, const char *buf_end, size_t last_len, int *ret) {
+        int ret_cnt = 0;
+        buf = last_len < 3 ? buf : buf + last_len - 3;
+
+        while (1) {
+                CHECK_EOF();
+                if (*buf == '\015') {
+                        ++buf;
+                        CHECK_EOF();
+                        EXPECT_CHAR('\012');
+                        ++ret_cnt;
+                } else if (*buf == '\012') {
+                        ++buf;
+                        ++ret_cnt;
+                } else {
+                        ++buf;
+                        ret_cnt = 0;
+                }
+                if (ret_cnt == 2) {
+                        return buf;
+                }
+        }
+
+        *ret = -2;
+        return NULL;
 }
 
-#define PARSE_INT(valp_, mul_)                                                                                                     \
-    if (*buf < '0' || '9' < *buf) {                                                                                                \
-        buf++;                                                                                                                     \
-        *ret = -1;                                                                                                                 \
-        return NULL;                                                                                                               \
-    }                                                                                                                              \
-    *(valp_) = (mul_) * (*buf++ - '0');
-
-#define PARSE_INT_3(valp_)                                                                                                         \
-    do {                                                                                                                           \
-        int res_ = 0;                                                                                                              \
-        PARSE_INT(&res_, 100)                                                                                                      \
-        *valp_ = res_;                                                                                                             \
-        PARSE_INT(&res_, 10)                                                                                                       \
-        *valp_ += res_;                                                                                                            \
-        PARSE_INT(&res_, 1)                                                                                                        \
-        *valp_ += res_;                                                                                                            \
-    } while (0)
+#define PARSE_INT(valp_, mul_)                                                                                                             \
+        if (*buf < '0' || '9' < *buf) {                                                                                                        \
+                buf++;                                                                                                                             \
+                *ret = -1;                                                                                                                         \
+                return NULL;                                                                                                                       \
+        }                                                                                                                                      \
+        *(valp_) = (mul_) * (*buf++ - '0');
+
+#define PARSE_INT_3(valp_)                                                                                                                 \
+        do {                                                                                                                                   \
+                int res_ = 0;                                                                                                                      \
+                PARSE_INT(&res_, 100)                                                                                                              \
+                *valp_ = res_;                                                                                                                     \
+                PARSE_INT(&res_, 10)                                                                                                               \
+                *valp_ += res_;                                                                                                                    \
+                PARSE_INT(&res_, 1)                                                                                                                \
+                *valp_ += res_;                                                                                                                    \
+        } while (0)
 
 /* returned pointer is always within [buf, buf_end), or null */
-static const char *parse_http_version(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *ret)
-{
-    /* we want at least [HTTP/1.<two chars>] to try to parse */
-    if (buf_end - buf < 9) {
-        *ret = -2;
-        return NULL;
-    }
-    EXPECT_CHAR_NO_CHECK('H');
-    EXPECT_CHAR_NO_CHECK('T');
-    EXPECT_CHAR_NO_CHECK('T');
-    EXPECT_CHAR_NO_CHECK('P');
-    EXPECT_CHAR_NO_CHECK('/');
-    PARSE_INT(major_version, 1);
-    if (*major_version == 1) {
-        EXPECT_CHAR_NO_CHECK('.');
-        PARSE_INT(minor_version, 1);
-    } else {
-        *minor_version = 0;
-    }
-    return buf;
+static const char *parse_http_version(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *ret) {
+        /* we want at least [HTTP/1.<two chars>] to try to parse */
+        if (buf_end - buf < 9) {
+                *ret = -2;
+                return NULL;
+        }
+        EXPECT_CHAR_NO_CHECK('H');
+        EXPECT_CHAR_NO_CHECK('T');
+        EXPECT_CHAR_NO_CHECK('T');
+        EXPECT_CHAR_NO_CHECK('P');
+        EXPECT_CHAR_NO_CHECK('/');
+        PARSE_INT(major_version, 1);
+        if (*major_version == 1) {
+                EXPECT_CHAR_NO_CHECK('.');
+                PARSE_INT(minor_version, 1);
+        } else {
+                *minor_version = 0;
+        }
+        return buf;
 }
 
-static const char *parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, size_t *num_headers,
-                                 size_t max_headers, int *ret)
-{
-    for (;; ++*num_headers) {
-        CHECK_EOF();
-        if (*buf == '\015') {
-            ++buf;
-            EXPECT_CHAR('\012');
-            break;
-        } else if (*buf == '\012') {
-            ++buf;
-            break;
-        }
-        if (*num_headers == max_headers) {
-            *ret = -1;
-            return NULL;
-        }
-        if (!(*num_headers != 0 && (*buf == ' ' || *buf == '\t'))) {
-            /* parsing name, but do not discard SP before colon, see
-             * http://www.mozilla.org/security/announce/2006/mfsa2006-33.html */
-            headers[*num_headers].name = buf;
-            static const char ALIGNED(16) ranges1[] = "\x00 "  /* control chars and up to SP */
-                                                      "\"\""   /* 0x22 */
-                                                      "()"     /* 0x28,0x29 */
-                                                      ",,"     /* 0x2c */
-                                                      "//"     /* 0x2f */
-                                                      ":@"     /* 0x3a-0x40 */
-                                                      "[]"     /* 0x5b-0x5d */
-                                                      "{\377"; /* 0x7b-0xff */
-            int found;
-            buf = findchar_fast(buf, buf_end, ranges1, sizeof(ranges1) - 1, &found);
-            if (!found) {
-                CHECK_EOF();
-            }
-            while (1) {
-                if (*buf == ':') {
-                    break;
-                } else if (!token_char_map[(unsigned char)*buf]) {
-                    *ret = -1;
-                    return NULL;
-                }
-                ++buf;
-                CHECK_EOF();
-            }
-            if ((headers[*num_headers].name_len = buf - headers[*num_headers].name) == 0) {
-                *ret = -1;
-                return NULL;
-            }
-            ++buf;
-            for (;; ++buf) {
-                CHECK_EOF();
-                if (!(*buf == ' ' || *buf == '\t')) {
-                    break;
-                }
-            }
-        } else {
-            headers[*num_headers].name = NULL;
-            headers[*num_headers].name_len = 0;
-        }
-        const char *value;
-        size_t value_len;
-        if ((buf = get_token_to_eol(buf, buf_end, &value, &value_len, ret)) == NULL) {
-            return NULL;
-        }
-        /* remove trailing SPs and HTABs */
-        const char *value_end = value + value_len;
-        for (; value_end != value; --value_end) {
-            const char c = *(value_end - 1);
-            if (!(c == ' ' || c == '\t')) {
-                break;
-            }
-        }
-        headers[*num_headers].value = value;
-        headers[*num_headers].value_len = value_end - value;
-    }
-    return buf;
+static const char *parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, size_t *num_headers, size_t max_headers,
+                                                                 int *ret) {
+        for (;; ++*num_headers) {
+                CHECK_EOF();
+                if (*buf == '\015') {
+                        ++buf;
+                        EXPECT_CHAR('\012');
+                        break;
+                } else if (*buf == '\012') {
+                        ++buf;
+                        break;
+                }
+                if (*num_headers == max_headers) {
+                        *ret = -1;
+                        return NULL;
+                }
+                if (!(*num_headers != 0 && (*buf == ' ' || *buf == '\t'))) {
+                        /* parsing name, but do not discard SP before colon, see
+                         * http://www.mozilla.org/security/announce/2006/mfsa2006-33.html */
+                        headers[*num_headers].name = buf;
+                        static const char ALIGNED(16) ranges1[] = "\x00 "  /* control chars and up to SP */
+                                                                                                          "\"\""   /* 0x22 */
+                                                                                                          "()"     /* 0x28,0x29 */
+                                                                                                          ",,"     /* 0x2c */
+                                                                                                          "//"     /* 0x2f */
+                                                                                                          ":@"     /* 0x3a-0x40 */
+                                                                                                          "[]"     /* 0x5b-0x5d */
+                                                                                                          "{\377"; /* 0x7b-0xff */
+                        int found;
+                        buf = findchar_fast(buf, buf_end, ranges1, sizeof(ranges1) - 1, &found);
+                        if (!found) {
+                                CHECK_EOF();
+                        }
+                        while (1) {
+                                if (*buf == ':') {
+                                        break;
+                                } else if (!token_char_map[(unsigned char)*buf]) {
+                                        *ret = -1;
+                                        return NULL;
+                                }
+                                ++buf;
+                                CHECK_EOF();
+                        }
+                        if ((headers[*num_headers].name_len = buf - headers[*num_headers].name) == 0) {
+                                *ret = -1;
+                                return NULL;
+                        }
+                        ++buf;
+                        for (;; ++buf) {
+                                CHECK_EOF();
+                                if (!(*buf == ' ' || *buf == '\t')) {
+                                        break;
+                                }
+                        }
+                } else {
+                        headers[*num_headers].name = NULL;
+                        headers[*num_headers].name_len = 0;
+                }
+                const char *value;
+                size_t value_len;
+                if ((buf = get_token_to_eol(buf, buf_end, &value, &value_len, ret)) == NULL) {
+                        return NULL;
+                }
+                /* remove trailing SPs and HTABs */
+                const char *value_end = value + value_len;
+                for (; value_end != value; --value_end) {
+                        const char c = *(value_end - 1);
+                        if (!(c == ' ' || c == '\t')) {
+                                break;
+                        }
+                }
+                headers[*num_headers].value = value;
+                headers[*num_headers].value_len = value_end - value;
+        }
+        return buf;
 }
 
 static const char *parse_request(const char *buf, const char *buf_end, const char **method, size_t *method_len, const char **path,
-                                 size_t *path_len, int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers,
-                                 size_t max_headers, int *ret)
-{
-    /* skip first empty line (some clients add CRLF after POST content) */
-    CHECK_EOF();
-    if (*buf == '\015') {
-        ++buf;
-        EXPECT_CHAR('\012');
-    } else if (*buf == '\012') {
-        ++buf;
-    }
-
-    /* parse request line */
-    ADVANCE_TOKEN(*method, *method_len);
-    do {
-        ++buf;
-    } while (*buf == ' ');
-    ADVANCE_TOKEN(*path, *path_len);
-    do {
-        ++buf;
-    } while (*buf == ' ');
-    if (*method_len == 0 || *path_len == 0) {
-        *ret = -1;
-        return NULL;
-    }
-    if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
-        return NULL;
-    }
-    if (*buf == '\015') {
-        ++buf;
-        EXPECT_CHAR('\012');
-    } else if (*buf == '\012') {
-        ++buf;
-    } else {
-        *ret = -1;
-        return NULL;
-    }
-
-    return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
+                                                                 size_t *path_len, int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers,
+                                                                 size_t max_headers, int *ret) {
+        /* skip first empty line (some clients add CRLF after POST content) */
+        CHECK_EOF();
+        if (*buf == '\015') {
+                ++buf;
+                EXPECT_CHAR('\012');
+        } else if (*buf == '\012') {
+                ++buf;
+        }
+
+        /* parse request line */
+        ADVANCE_TOKEN(*method, *method_len);
+        do {
+                ++buf;
+        } while (*buf == ' ');
+        ADVANCE_TOKEN(*path, *path_len);
+        do {
+                ++buf;
+        } while (*buf == ' ');
+        if (*method_len == 0 || *path_len == 0) {
+                *ret = -1;
+                return NULL;
+        }
+        if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
+                return NULL;
+        }
+        if (*buf == '\015') {
+                ++buf;
+                EXPECT_CHAR('\012');
+        } else if (*buf == '\012') {
+                ++buf;
+        } else {
+                *ret = -1;
+                return NULL;
+        }
+
+        return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
 }
 
-int phr_parse_request(const char *buf_start, size_t len, const char **method, size_t *method_len, const char **path,
-                      size_t *path_len, int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len)
-{
-    const char *buf = buf_start, *buf_end = buf_start + len;
-    size_t max_headers = *num_headers;
-    int r;
-
-    *method = NULL;
-    *method_len = 0;
-    *path = NULL;
-    *path_len = 0;
-    *major_version = -1;
-    *minor_version = -1;
-    *num_headers = 0;
-
-    /* if last_len != 0, check if the request is complete (a fast countermeasure
-       against slowloris */
-    if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
-        return r;
-    }
-
-    if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, major_version, minor_version, headers, num_headers, max_headers,
-                             &r)) == NULL) {
-        return r;
-    }
-
-    return (int)(buf - buf_start);
+int phr_parse_request(const char *buf_start, size_t len, const char **method, size_t *method_len, const char **path, size_t *path_len,
+                                          int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len) {
+        const char *buf = buf_start, *buf_end = buf_start + len;
+        size_t max_headers = *num_headers;
+        int r;
+
+        *method = NULL;
+        *method_len = 0;
+        *path = NULL;
+        *path_len = 0;
+        *major_version = -1;
+        *minor_version = -1;
+        *num_headers = 0;
+
+        /* if last_len != 0, check if the request is complete (a fast countermeasure
+           against slowloris */
+        if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
+                return r;
+        }
+
+        if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, major_version, minor_version, headers, num_headers,
+                                                         max_headers, &r)) == NULL) {
+                return r;
+        }
+
+        return (int)(buf - buf_start);
 }
 
-static const char *parse_response(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *status, const char **msg,
-                                  size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t max_headers, int *ret)
-{
-    /* parse "HTTP/1.x" */
-    if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
-        return NULL;
-    }
-    /* skip space */
-    if (*buf != ' ') {
-        *ret = -1;
-        return NULL;
-    }
-    do {
-        ++buf;
-    } while (*buf == ' ');
-    /* parse status code, we want at least [:digit:][:digit:][:digit:]<other char> to try to parse */
-    if (buf_end - buf < 4) {
-        *ret = -2;
-        return NULL;
-    }
-    PARSE_INT_3(status);
-
-    /* get message including preceding space */
-    if ((buf = get_token_to_eol(buf, buf_end, msg, msg_len, ret)) == NULL) {
-        return NULL;
-    }
-    if (*msg_len == 0) {
-        /* ok */
-    } else if (**msg == ' ') {
-        /* remove preceding space */
-        do {
-            ++*msg;
-            --*msg_len;
-        } while (**msg == ' ');
-    } else {
-        /* garbage found after status code */
-        *ret = -1;
-        return NULL;
-    }
-
-    return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
+static const char *parse_response(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *status,
+                                                                  const char **msg, size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t max_headers,
+                                                                  int *ret) {
+        /* parse "HTTP/1.x" */
+        if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
+                return NULL;
+        }
+        /* skip space */
+        if (*buf != ' ') {
+                *ret = -1;
+                return NULL;
+        }
+        do {
+                ++buf;
+        } while (*buf == ' ');
+        /* parse status code, we want at least [:digit:][:digit:][:digit:]<other char> to try to parse */
+        if (buf_end - buf < 4) {
+                *ret = -2;
+                return NULL;
+        }
+        PARSE_INT_3(status);
+
+        /* get message including preceding space */
+        if ((buf = get_token_to_eol(buf, buf_end, msg, msg_len, ret)) == NULL) {
+                return NULL;
+        }
+        if (*msg_len == 0) {
+                /* ok */
+        } else if (**msg == ' ') {
+                /* remove preceding space */
+                do {
+                        ++*msg;
+                        --*msg_len;
+                } while (**msg == ' ');
+        } else {
+                /* garbage found after status code */
+                *ret = -1;
+                return NULL;
+        }
+
+        return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
 }
 
-int phr_parse_response(const char *buf_start, size_t len, int *major_version, int *minor_version, int *status, const char **msg, size_t *msg_len,
-                       struct phr_header *headers, size_t *num_headers, size_t last_len)
-{
-    const char *buf = buf_start, *buf_end = buf + len;
-    size_t max_headers = *num_headers;
-    int r;
-
-    *major_version = -1;
-    *minor_version = -1;
-    *status = 0;
-    *msg = NULL;
-    *msg_len = 0;
-    *num_headers = 0;
-
-    /* if last_len != 0, check if the response is complete (a fast countermeasure
-       against slowloris */
-    if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
-        return r;
-    }
-
-    if ((buf = parse_response(buf, buf_end, major_version, minor_version, status, msg, msg_len, headers, num_headers, max_headers, &r)) == NULL) {
-        return r;
-    }
-
-    return (int)(buf - buf_start);
+int phr_parse_response(const char *buf_start, size_t len, int *major_version, int *minor_version, int *status, const char **msg,
+                                           size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t last_len) {
+        const char *buf = buf_start, *buf_end = buf + len;
+        size_t max_headers = *num_headers;
+        int r;
+
+        *major_version = -1;
+        *minor_version = -1;
+        *status = 0;
+        *msg = NULL;
+        *msg_len = 0;
+        *num_headers = 0;
+
+        /* if last_len != 0, check if the response is complete (a fast countermeasure
+           against slowloris */
+        if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
+                return r;
+        }
+
+        if ((buf = parse_response(buf, buf_end, major_version, minor_version, status, msg, msg_len, headers, num_headers, max_headers, &r)) ==
+                NULL) {
+                return r;
+        }
+
+        return (int)(buf - buf_start);
 }
 
-int phr_parse_headers(const char *buf_start, size_t len, struct phr_header *headers, size_t *num_headers, size_t last_len)
-{
-    const char *buf = buf_start, *buf_end = buf + len;
-    size_t max_headers = *num_headers;
-    int r;
+int phr_parse_headers(const char *buf_start, size_t len, struct phr_header *headers, size_t *num_headers, size_t last_len) {
+        const char *buf = buf_start, *buf_end = buf + len;
+        size_t max_headers = *num_headers;
+        int r;
 
-    *num_headers = 0;
+        *num_headers = 0;
 
-    /* if last_len != 0, check if the response is complete (a fast countermeasure
-       against slowloris */
-    if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
-        return r;
-    }
+        /* if last_len != 0, check if the response is complete (a fast countermeasure
+           against slowloris */
+        if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
+                return r;
+        }
 
-    if ((buf = parse_headers(buf, buf_end, headers, num_headers, max_headers, &r)) == NULL) {
-        return r;
-    }
+        if ((buf = parse_headers(buf, buf_end, headers, num_headers, max_headers, &r)) == NULL) {
+                return r;
+        }
 
-    return (int)(buf - buf_start);
+        return (int)(buf - buf_start);
 }
 
 enum {
-    CHUNKED_IN_CHUNK_SIZE,
-    CHUNKED_IN_CHUNK_EXT,
-    CHUNKED_IN_CHUNK_DATA,
-    CHUNKED_IN_CHUNK_CRLF,
-    CHUNKED_IN_TRAILERS_LINE_HEAD,
-    CHUNKED_IN_TRAILERS_LINE_MIDDLE
+        CHUNKED_IN_CHUNK_SIZE,
+        CHUNKED_IN_CHUNK_EXT,
+        CHUNKED_IN_CHUNK_DATA,
+        CHUNKED_IN_CHUNK_CRLF,
+        CHUNKED_IN_TRAILERS_LINE_HEAD,
+        CHUNKED_IN_TRAILERS_LINE_MIDDLE
 };
 
-static int decode_hex(int ch)
-{
-    if ('0' <= ch && ch <= '9') {
-        return ch - '0';
-    } else if ('A' <= ch && ch <= 'F') {
-        return ch - 'A' + 0xa;
-    } else if ('a' <= ch && ch <= 'f') {
-        return ch - 'a' + 0xa;
-    } else {
-        return -1;
-    }
+static int decode_hex(int ch) {
+        if ('0' <= ch && ch <= '9') {
+                return ch - '0';
+        } else if ('A' <= ch && ch <= 'F') {
+                return ch - 'A' + 0xa;
+        } else if ('a' <= ch && ch <= 'f') {
+                return ch - 'a' + 0xa;
+        } else {
+                return -1;
+        }
 }
 
-ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_t *_bufsz)
-{
-    size_t dst = 0, src = 0, bufsz = *_bufsz;
-    ssize_t ret = -2; /* incomplete */
-
-    while (1) {
-        switch (decoder->_state) {
-        case CHUNKED_IN_CHUNK_SIZE:
-            for (;; ++src) {
-                int v;
-                if (src == bufsz)
-                    goto Exit;
-                if ((v = decode_hex(buf[src])) == -1) {
-                    if (decoder->_hex_count == 0) {
-                        ret = -1;
-                        goto Exit;
-                    }
-                    break;
-                }
-                if (decoder->_hex_count == sizeof(size_t) * 2) {
-                    ret = -1;
-                    goto Exit;
-                }
-                decoder->bytes_left_in_chunk = decoder->bytes_left_in_chunk * 16 + v;
-                ++decoder->_hex_count;
-            }
-            decoder->_hex_count = 0;
-            decoder->_state = CHUNKED_IN_CHUNK_EXT;
-        /* fallthru */
-        case CHUNKED_IN_CHUNK_EXT:
-            /* RFC 7230 A.2 "Line folding in chunk extensions is disallowed" */
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] == '\012')
-                    break;
-            }
-            ++src;
-            if (decoder->bytes_left_in_chunk == 0) {
-                if (decoder->consume_trailer) {
-                    decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
-                    break;
-                } else {
-                    goto Complete;
-                }
-            }
-            decoder->_state = CHUNKED_IN_CHUNK_DATA;
-        /* fallthru */
-        case CHUNKED_IN_CHUNK_DATA: {
-            size_t avail = bufsz - src;
-            if (avail < decoder->bytes_left_in_chunk) {
-                if (dst != src)
-                    memmove(buf + dst, buf + src, avail);
-                src += avail;
-                dst += avail;
-                decoder->bytes_left_in_chunk -= avail;
-                goto Exit;
-            }
-            if (dst != src)
-                memmove(buf + dst, buf + src, decoder->bytes_left_in_chunk);
-            src += decoder->bytes_left_in_chunk;
-            dst += decoder->bytes_left_in_chunk;
-            decoder->bytes_left_in_chunk = 0;
-            decoder->_state = CHUNKED_IN_CHUNK_CRLF;
-        }
-        /* fallthru */
-        case CHUNKED_IN_CHUNK_CRLF:
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] != '\015')
-                    break;
-            }
-            if (buf[src] != '\012') {
-                ret = -1;
-                goto Exit;
-            }
-            ++src;
-            decoder->_state = CHUNKED_IN_CHUNK_SIZE;
-            break;
-        case CHUNKED_IN_TRAILERS_LINE_HEAD:
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] != '\015')
-                    break;
-            }
-            if (buf[src++] == '\012')
-                goto Complete;
-            decoder->_state = CHUNKED_IN_TRAILERS_LINE_MIDDLE;
-        /* fallthru */
-        case CHUNKED_IN_TRAILERS_LINE_MIDDLE:
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] == '\012')
-                    break;
-            }
-            ++src;
-            decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
-            break;
-        default:
-            assert(!"decoder is corrupt");
-        }
-    }
+ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_t *_bufsz) {
+        size_t dst = 0, src = 0, bufsz = *_bufsz;
+        ssize_t ret = -2; /* incomplete */
+
+        while (1) {
+                switch (decoder->_state) {
+                case CHUNKED_IN_CHUNK_SIZE:
+                        for (;; ++src) {
+                                int v;
+                                if (src == bufsz)
+                                        goto Exit;
+                                if ((v = decode_hex(buf[src])) == -1) {
+                                        if (decoder->_hex_count == 0) {
+                                                ret = -1;
+                                                goto Exit;
+                                        }
+                                        break;
+                                }
+                                if (decoder->_hex_count == sizeof(size_t) * 2) {
+                                        ret = -1;
+                                        goto Exit;
+                                }
+                                decoder->bytes_left_in_chunk = decoder->bytes_left_in_chunk * 16 + v;
+                                ++decoder->_hex_count;
+                        }
+                        decoder->_hex_count = 0;
+                        decoder->_state = CHUNKED_IN_CHUNK_EXT;
+                /* fallthru */
+                case CHUNKED_IN_CHUNK_EXT:
+                        /* RFC 7230 A.2 "Line folding in chunk extensions is disallowed" */
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] == '\012')
+                                        break;
+                        }
+                        ++src;
+                        if (decoder->bytes_left_in_chunk == 0) {
+                                if (decoder->consume_trailer) {
+                                        decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
+                                        break;
+                                } else {
+                                        goto Complete;
+                                }
+                        }
+                        decoder->_state = CHUNKED_IN_CHUNK_DATA;
+                /* fallthru */
+                case CHUNKED_IN_CHUNK_DATA: {
+                        size_t avail = bufsz - src;
+                        if (avail < decoder->bytes_left_in_chunk) {
+                                if (dst != src)
+                                        memmove(buf + dst, buf + src, avail);
+                                src += avail;
+                                dst += avail;
+                                decoder->bytes_left_in_chunk -= avail;
+                                goto Exit;
+                        }
+                        if (dst != src)
+                                memmove(buf + dst, buf + src, decoder->bytes_left_in_chunk);
+                        src += decoder->bytes_left_in_chunk;
+                        dst += decoder->bytes_left_in_chunk;
+                        decoder->bytes_left_in_chunk = 0;
+                        decoder->_state = CHUNKED_IN_CHUNK_CRLF;
+                }
+                /* fallthru */
+                case CHUNKED_IN_CHUNK_CRLF:
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] != '\015')
+                                        break;
+                        }
+                        if (buf[src] != '\012') {
+                                ret = -1;
+                                goto Exit;
+                        }
+                        ++src;
+                        decoder->_state = CHUNKED_IN_CHUNK_SIZE;
+                        break;
+                case CHUNKED_IN_TRAILERS_LINE_HEAD:
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] != '\015')
+                                        break;
+                        }
+                        if (buf[src++] == '\012')
+                                goto Complete;
+                        decoder->_state = CHUNKED_IN_TRAILERS_LINE_MIDDLE;
+                /* fallthru */
+                case CHUNKED_IN_TRAILERS_LINE_MIDDLE:
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] == '\012')
+                                        break;
+                        }
+                        ++src;
+                        decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
+                        break;
+                default:
+                        assert(!"decoder is corrupt");
+                }
+        }
 
 Complete:
-    ret = bufsz - src;
+        ret = bufsz - src;
 Exit:
-    if (dst != src)
-        memmove(buf + dst, buf + src, bufsz - src);
-    *_bufsz = dst;
-    return ret;
+        if (dst != src)
+                memmove(buf + dst, buf + src, bufsz - src);
+        *_bufsz = dst;
+        return ret;
 }
 
-int phr_decode_chunked_is_in_data(struct phr_chunked_decoder *decoder)
-{
-    return decoder->_state == CHUNKED_IN_CHUNK_DATA;
-}
+int phr_decode_chunked_is_in_data(struct phr_chunked_decoder *decoder) { return decoder->_state == CHUNKED_IN_CHUNK_DATA; }
 
 #undef CHECK_EOF
 #undef EXPECT_CHAR
diff --git a/plugins/popen.c b/plugins/popen.c
index 54e63bc..2b9824b 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -1,42 +1,42 @@
 /*****************************************************************************
-* 
-* Monitoring Plugins popen
-* 
-* License: GPL
-* Copyright (c) 2005-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* A safe alternative to popen
-* 
-* Provides spopen and spclose
-* 
-* FILE * spopen(const char *);
-* int spclose(FILE *);
-* 
-* Code taken with little modification from "Advanced Programming for the Unix
-* Environment" by W. Richard Stevens
-* 
-* This is considered safe in that no shell is spawned, and the environment
-* and path passed to the exec'd program are essentially empty. (popen create
-* a shell and passes the environment to it).
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring Plugins popen
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * A safe alternative to popen
+ *
+ * Provides spopen and spclose
+ *
+ * FILE * spopen(const char *);
+ * int spclose(FILE *);
+ *
+ * Code taken with little modification from "Advanced Programming for the Unix
+ * Environment" by W. Richard Stevens
+ *
+ * This is considered safe in that no shell is spawned, and the environment
+ * and path passed to the exec'd program are essentially empty. (popen create
+ * a shell and passes the environment to it).
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "./common.h"
 #include "./utils.h"
@@ -47,63 +47,52 @@ extern pid_t *childpid;
 extern int *child_stderr_array;
 extern FILE *child_process;
 
-FILE *spopen (const char *);
-int spclose (FILE *);
+FILE *spopen(const char * /*cmdstring*/);
+int spclose(FILE * /*fp*/);
 #ifdef REDHAT_SPOPEN_ERROR
-void popen_sigchld_handler (int);
+void popen_sigchld_handler(int);
 #endif
-void popen_timeout_alarm_handler (int);
+void popen_timeout_alarm_handler(int /*signo*/);
 
-#include <stdarg.h>                                                     /* ANSI C header file */
+#include <stdarg.h> /* ANSI C header file */
 #include <fcntl.h>
 
 #include <limits.h>
 #include <sys/resource.h>
 
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+#       include <sys/wait.h>
 #endif
 
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#       define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 #endif
 
 #ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#       define WIFEXITED(stat_val) (((stat_val)&255) == 0)
 #endif
 
 /* 4.3BSD Reno <signal.h> doesn't define SIG_ERR */
 #if defined(SIG_IGN) && !defined(SIG_ERR)
-#define SIG_ERR ((Sigfunc *)-1)
+#       define SIG_ERR ((Sigfunc *)-1)
 #endif
 
-
-char *pname = NULL;                                                     /* caller can set this from argv[0] */
+char *pname = NULL; /* caller can set this from argv[0] */
 
 #ifdef REDHAT_SPOPEN_ERROR
 static volatile int childtermd = 0;
 #endif
 
-FILE *
-spopen (const char *cmdstring)
-{
-        char *env[2];
-        char *cmd = NULL;
-        char **argv = NULL;
-        char *str, *tmp;
-        int argc;
-
-        int i = 0, pfd[2], pfderr[2];
-        pid_t pid;
-
-#ifdef  RLIMIT_CORE
+FILE *spopen(const char *cmdstring) {
+#ifdef RLIMIT_CORE
         /* do not leave core files */
         struct rlimit limit;
-        getrlimit (RLIMIT_CORE, &limit);
+        getrlimit(RLIMIT_CORE, &limit);
         limit.rlim_cur = 0;
-        setrlimit (RLIMIT_CORE, &limit);
+        setrlimit(RLIMIT_CORE, &limit);
 #endif
 
+        char *env[2];
         env[0] = strdup("LC_ALL=C");
         env[1] = NULL;
 
@@ -111,184 +100,182 @@ spopen (const char *cmdstring)
         if (cmdstring == NULL)
                 return (NULL);
 
+        char *cmd = NULL;
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
-        cmd = malloc (strlen (cmdstring) + 1);
+        cmd = malloc(strlen(cmdstring) + 1);
         if (cmd == NULL)
                 return NULL;
-        strcpy (cmd, cmdstring);
+        strcpy(cmd, cmdstring);
 
         /* This is not a shell, so we don't handle "???" */
-        if (strstr (cmdstring, "\""))
+        if (strstr(cmdstring, "\""))
                 return NULL;
 
         /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
-        if (strstr (cmdstring, " ' ") || strstr (cmdstring, "'''"))
+        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''"))
                 return NULL;
 
+        int argc;
+        char **argv = NULL;
         /* there cannot be more args than characters */
-        argc = strlen (cmdstring) + 1;  /* add 1 for NULL termination */
-        argv = malloc (sizeof(char*)*argc);
+        argc = strlen(cmdstring) + 1; /* add 1 for NULL termination */
+        argv = malloc(sizeof(char *) * argc);
 
         if (argv == NULL) {
-                printf ("%s\n", _("Could not malloc argv array in popen()"));
+                printf("%s\n", _("Could not malloc argv array in popen()"));
                 return NULL;
         }
 
+        int i = 0;
+        char *str;
         /* loop to get arguments to command */
         while (cmd) {
                 str = cmd;
-                str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+                str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
 
                 if (i >= argc - 2) {
-                        printf ("%s\n",_("CRITICAL - You need more args!!!"));
+                        printf("%s\n", _("CRITICAL - You need more args!!!"));
                         return (NULL);
                 }
 
-                if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+                if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr (str, "'"))
-                                return NULL;                                            /* balanced? */
-                        cmd = 1 + strstr (str, "'");
-                        str[strcspn (str, "'")] = 0;
-                }
-                else if (strcspn(str,"'") < strcspn (str, " \t\r\n")) {
-                                                                                /* handle --option='foo bar' strings */
-                        tmp = str + strcspn(str, "'") + 1;
-                        if (!strstr (tmp, "'"))
-                                return NULL;                                            /* balanced? */
-                        tmp += strcspn(tmp,"'") + 1;
+                        if (!strstr(str, "'"))
+                                return NULL; /* balanced? */
+                        cmd = 1 + strstr(str, "'");
+                        str[strcspn(str, "'")] = 0;
+                } else if (strcspn(str, "'") < strcspn(str, " \t\r\n")) {
+                        /* handle --option='foo bar' strings */
+                        char *tmp = str + strcspn(str, "'") + 1;
+                        if (!strstr(tmp, "'"))
+                                return NULL; /* balanced? */
+                        tmp += strcspn(tmp, "'") + 1;
                         *tmp = 0;
                         cmd = tmp + 1;
                 } else {
-                        if (strpbrk (str, " \t\r\n")) {
-                                cmd = 1 + strpbrk (str, " \t\r\n");
-                                str[strcspn (str, " \t\r\n")] = 0;
-                        }
-                        else {
+                        if (strpbrk(str, " \t\r\n")) {
+                                cmd = 1 + strpbrk(str, " \t\r\n");
+                                str[strcspn(str, " \t\r\n")] = 0;
+                        } else {
                                 cmd = NULL;
                         }
                 }
 
-                if (cmd && strlen (cmd) == strspn (cmd, " \t\r\n"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
                         cmd = NULL;
 
                 argv[i++] = str;
-
         }
         argv[i] = NULL;
 
         long maxfd = mp_open_max();
 
-        if (childpid == NULL) {                         /* first time through */
-                if ((childpid = calloc ((size_t)maxfd, sizeof (pid_t))) == NULL)
+        if (childpid == NULL) { /* first time through */
+                if ((childpid = calloc((size_t)maxfd, sizeof(pid_t))) == NULL)
                         return (NULL);
         }
 
-        if (child_stderr_array == NULL) {       /* first time through */
-                if ((child_stderr_array = calloc ((size_t)maxfd, sizeof (int))) == NULL)
+        if (child_stderr_array == NULL) { /* first time through */
+                if ((child_stderr_array = calloc((size_t)maxfd, sizeof(int))) == NULL)
                         return (NULL);
         }
 
-        if (pipe (pfd) < 0)
-                return (NULL);                                                  /* errno set by pipe() */
+        int pfd[2];
+        if (pipe(pfd) < 0)
+                return (NULL); /* errno set by pipe() */
 
-        if (pipe (pfderr) < 0)
-                return (NULL);                                                  /* errno set by pipe() */
+        int pfderr[2];
+        if (pipe(pfderr) < 0)
+                return (NULL); /* errno set by pipe() */
 
 #ifdef REDHAT_SPOPEN_ERROR
-        if (signal (SIGCHLD, popen_sigchld_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGCHLD"));
+        if (signal(SIGCHLD, popen_sigchld_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGCHLD"));
         }
 #endif
 
-        if ((pid = fork ()) < 0)
-                return (NULL);                                                  /* errno set by fork() */
-        else if (pid == 0) {                                    /* child */
-                close (pfd[0]);
+        pid_t pid;
+        if ((pid = fork()) < 0)
+                return (NULL); /* errno set by fork() */
+
+        if (pid == 0) { /* child */
+                close(pfd[0]);
                 if (pfd[1] != STDOUT_FILENO) {
-                        dup2 (pfd[1], STDOUT_FILENO);
-                        close (pfd[1]);
+                        dup2(pfd[1], STDOUT_FILENO);
+                        close(pfd[1]);
                 }
-                close (pfderr[0]);
+                close(pfderr[0]);
                 if (pfderr[1] != STDERR_FILENO) {
-                        dup2 (pfderr[1], STDERR_FILENO);
-                        close (pfderr[1]);
+                        dup2(pfderr[1], STDERR_FILENO);
+                        close(pfderr[1]);
                 }
                 /* close all descriptors in childpid[] */
                 for (i = 0; i < maxfd; i++)
                         if (childpid[i] > 0)
-                                close (i);
+                                close(i);
 
-                execve (argv[0], argv, env);
-                _exit (0);
+                execve(argv[0], argv, env);
+                _exit(0);
         }
 
-        close (pfd[1]);                                                         /* parent */
-        if ((child_process = fdopen (pfd[0], "r")) == NULL)
+        close(pfd[1]); /* parent */
+        if ((child_process = fdopen(pfd[0], "r")) == NULL)
                 return (NULL);
-        close (pfderr[1]);
+        close(pfderr[1]);
 
-        childpid[fileno (child_process)] = pid; /* remember child pid for this fd */
-        child_stderr_array[fileno (child_process)] = pfderr[0]; /* remember STDERR */
+        childpid[fileno(child_process)] = pid;                 /* remember child pid for this fd */
+        child_stderr_array[fileno(child_process)] = pfderr[0]; /* remember STDERR */
         return (child_process);
 }
 
-int
-spclose (FILE * fp)
-{
-        int fd, status;
-        pid_t pid;
-
+int spclose(FILE *fp) {
         if (childpid == NULL)
-                return (1);                                                             /* popen() has never been called */
+                return (1); /* popen() has never been called */
 
-        fd = fileno (fp);
+        pid_t pid;
+        int fd = fileno(fp);
         if ((pid = childpid[fd]) == 0)
-                return (1);                                                             /* fp wasn't opened by popen() */
+                return (1); /* fp wasn't opened by popen() */
 
         childpid[fd] = 0;
-        if (fclose (fp) == EOF)
+        if (fclose(fp) == EOF)
                 return (1);
 
 #ifdef REDHAT_SPOPEN_ERROR
-        while (!childtermd);                                                            /* wait until SIGCHLD */
+        while (!childtermd)
+                ; /* wait until SIGCHLD */
 #endif
 
-        while (waitpid (pid, &status, 0) < 0)
+        int status;
+        while (waitpid(pid, &status, 0) < 0)
                 if (errno != EINTR)
-                        return (1);                                                     /* error other than EINTR from waitpid() */
+                        return (1); /* error other than EINTR from waitpid() */
 
-        if (WIFEXITED (status))
-                return (WEXITSTATUS (status));  /* return child's termination status */
+        if (WIFEXITED(status))
+                return (WEXITSTATUS(status)); /* return child's termination status */
 
         return (1);
 }
 
 #ifdef REDHAT_SPOPEN_ERROR
-void
-popen_sigchld_handler (int signo)
-{
+void popen_sigchld_handler(int signo) {
         if (signo == SIGCHLD)
                 childtermd = 1;
 }
 #endif
 
-void
-popen_timeout_alarm_handler (int signo)
-{
-        int fh;
+void popen_timeout_alarm_handler(int signo) {
         if (signo == SIGALRM) {
                 if (child_process != NULL) {
-                        fh=fileno (child_process);
-                        if(fh >= 0){
-                                kill (childpid[fh], SIGKILL);
+                        int fh = fileno(child_process);
+                        if (fh >= 0) {
+                                kill(childpid[fh], SIGKILL);
                         }
-                        printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
-                                                timeout_interval);
+                        printf(_("CRITICAL - Plugin timed out after %d seconds\n"), timeout_interval);
                 } else {
-                        printf ("%s\n", _("CRITICAL - popen timeout received, but no child process"));
+                        printf("%s\n", _("CRITICAL - popen timeout received, but no child process"));
                 }
-                exit (STATE_CRITICAL);
+                exit(STATE_CRITICAL);
         }
 }
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index ed49bb9..2e53dc0 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -1,63 +1,63 @@
 /*****************************************************************************
-* 
-* Monitoring run command utilities
-* 
-* License: GPL
-* Copyright (c) 2005-2006 Monitoring Plugins Development Team
-* 
-* Description :
-* 
-* A simple interface to executing programs from other programs, using an
-* optimized and safe popen()-like implementation. It is considered safe
-* in that no shell needs to be spawned and the environment passed to the
-* execve()'d program is essentially empty.
-* 
-* The code in this file is a derivative of popen.c which in turn was taken
-* from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
-* 
-* Care has been taken to make sure the functions are async-safe. The one
-* function which isn't is np_runcmd_init() which it doesn't make sense to
-* call twice anyway, so the api as a whole should be considered async-safe.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring run command utilities
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description :
+ *
+ * A simple interface to executing programs from other programs, using an
+ * optimized and safe popen()-like implementation. It is considered safe
+ * in that no shell needs to be spawned and the environment passed to the
+ * execve()'d program is essentially empty.
+ *
+ * The code in this file is a derivative of popen.c which in turn was taken
+ * from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
+ *
+ * Care has been taken to make sure the functions are async-safe. The one
+ * function which isn't is np_runcmd_init() which it doesn't make sense to
+ * call twice anyway, so the api as a whole should be considered async-safe.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #define NAGIOSPLUG_API_C 1
 
 /** includes **/
 #include "runcmd.h"
 #ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
+#       include <sys/wait.h>
 #endif
 
 #include "./utils.h"
 
 /** macros **/
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#       define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 #endif
 
 #ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#       define WIFEXITED(stat_val) (((stat_val)&255) == 0)
 #endif
 
 /* 4.3BSD Reno <signal.h> doesn't define SIG_ERR */
 #if defined(SIG_IGN) && !defined(SIG_ERR)
-# define SIG_ERR ((Sigfunc *)-1)
+#       define SIG_ERR ((Sigfunc *)-1)
 #endif
 
 #include "../lib/maxfd.h"
@@ -72,33 +72,26 @@
 static pid_t *np_pids = NULL;
 
 /** prototypes **/
-static int np_runcmd_open(const char *, int *, int *)
-        __attribute__((__nonnull__(1, 2, 3)));
+static int np_runcmd_open(const char *, int *, int *) __attribute__((__nonnull__(1, 2, 3)));
 
-static int np_fetch_output(int, output *, int)
-        __attribute__((__nonnull__(2)));
+static int np_fetch_output(int, output *, int) __attribute__((__nonnull__(2)));
 
 static int np_runcmd_close(int);
 
 /* prototype imported from utils.h */
-extern void die (int, const char *, ...)
-        __attribute__((__noreturn__,__format__(__printf__, 2, 3)));
-
+extern void die(int, const char *, ...) __attribute__((__noreturn__, __format__(__printf__, 2, 3)));
 
 /* this function is NOT async-safe. It is exported so multithreaded
  * plugins (or other apps) can call it prior to running any commands
  * through this api and thus achieve async-safeness throughout the api */
-void np_runcmd_init(void)
-{
-  long maxfd = mp_open_max();
-        if(!np_pids) np_pids = calloc(maxfd, sizeof(pid_t));
+void np_runcmd_init(void) {
+        long maxfd = mp_open_max();
+        if (!np_pids)
+                np_pids = calloc(maxfd, sizeof(pid_t));
 }
 
-
 /* Start running a command */
-static int
-np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
-{
+static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
         char *env[2];
         char *cmd = NULL;
         char **argv = NULL;
@@ -112,7 +105,8 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
 
         int i = 0;
 
-        if(!np_pids) NP_RUNCMD_INIT;
+        if (!np_pids)
+                NP_RUNCMD_INIT;
 
         env[0] = strdup("LC_ALL=C");
         env[1] = NULL;
@@ -120,15 +114,17 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
         cmdlen = strlen(cmdstring);
-        if((cmd = malloc(cmdlen + 1)) == NULL) return -1;
+        if ((cmd = malloc(cmdlen + 1)) == NULL)
+                return -1;
         memcpy(cmd, cmdstring, cmdlen);
         cmd[cmdlen] = '\0';
 
         /* This is not a shell, so we don't handle "???" */
-        if (strstr (cmdstring, "\"")) return -1;
+        if (strstr(cmdstring, "\""))
+                return -1;
 
         /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
-        if (strstr (cmdstring, " ' ") || strstr (cmdstring, "'''"))
+        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''"))
                 return -1;
 
         /* each arg must be whitespace-separated, so args can be a maximum
@@ -137,32 +133,31 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         argv = calloc(sizeof(char *), argc);
 
         if (argv == NULL) {
-                printf ("%s\n", _("Could not malloc argv array in popen()"));
+                printf("%s\n", _("Could not malloc argv array in popen()"));
                 return -1;
         }
 
         /* get command arguments (stupidly, but fairly quickly) */
         while (cmd) {
                 str = cmd;
-                str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+                str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
 
-                if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+                if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr (str, "'")) return -1;      /* balanced? */
-                        cmd = 1 + strstr (str, "'");
-                        str[strcspn (str, "'")] = 0;
-                }
-                else {
-                        if (strpbrk (str, " \t\r\n")) {
-                                cmd = 1 + strpbrk (str, " \t\r\n");
-                                str[strcspn (str, " \t\r\n")] = 0;
-                        }
-                        else {
+                        if (!strstr(str, "'"))
+                                return -1; /* balanced? */
+                        cmd = 1 + strstr(str, "'");
+                        str[strcspn(str, "'")] = 0;
+                } else {
+                        if (strpbrk(str, " \t\r\n")) {
+                                cmd = 1 + strpbrk(str, " \t\r\n");
+                                str[strcspn(str, " \t\r\n")] = 0;
+                        } else {
                                 cmd = NULL;
                         }
                 }
 
-                if (cmd && strlen (cmd) == strspn (cmd, " \t\r\n"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
                         cmd = NULL;
 
                 argv[i++] = str;
@@ -173,33 +168,33 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
 
         /* child runs exceve() and _exit. */
         if (pid == 0) {
-#ifdef  RLIMIT_CORE
+#ifdef RLIMIT_CORE
                 /* the program we execve shouldn't leave core files */
-                getrlimit (RLIMIT_CORE, &limit);
+                getrlimit(RLIMIT_CORE, &limit);
                 limit.rlim_cur = 0;
-                setrlimit (RLIMIT_CORE, &limit);
+                setrlimit(RLIMIT_CORE, &limit);
 #endif
-                close (pfd[0]);
+                close(pfd[0]);
                 if (pfd[1] != STDOUT_FILENO) {
-                        dup2 (pfd[1], STDOUT_FILENO);
-                        close (pfd[1]);
+                        dup2(pfd[1], STDOUT_FILENO);
+                        close(pfd[1]);
                 }
-                close (pfderr[0]);
+                close(pfderr[0]);
                 if (pfderr[1] != STDERR_FILENO) {
-                        dup2 (pfderr[1], STDERR_FILENO);
-                        close (pfderr[1]);
+                        dup2(pfderr[1], STDERR_FILENO);
+                        close(pfderr[1]);
                 }
 
                 /* close all descriptors in np_pids[]
                  * This is executed in a separate address space (pure child),
                  * so we don't have to worry about async safety */
-    long maxfd = mp_open_max();
+                long maxfd = mp_open_max();
                 for (i = 0; i < maxfd; i++)
-                        if(np_pids[i] > 0)
-                                close (i);
+                        if (np_pids[i] > 0)
+                                close(i);
 
-                execve (argv[0], argv, env);
-                _exit (STATE_UNKNOWN);
+                execve(argv[0], argv, env);
+                _exit(STATE_UNKNOWN);
         }
 
         /* parent picks up execution here */
@@ -213,49 +208,44 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         return pfd[0];
 }
 
-
-static int
-np_runcmd_close(int fd)
-{
+static int np_runcmd_close(int fd) {
         int status;
         pid_t pid;
 
         /* make sure this fd was opened by popen() */
-  long maxfd = mp_open_max();
-        if(fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0)
+        long maxfd = mp_open_max();
+        if (fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0)
                 return -1;
 
         np_pids[fd] = 0;
-        if (close (fd) == -1) return -1;
+        if (close(fd) == -1)
+                return -1;
 
         /* EINTR is ok (sort of), everything else is bad */
-        while (waitpid (pid, &status, 0) < 0)
-                if (errno != EINTR) return -1;
+        while (waitpid(pid, &status, 0) < 0)
+                if (errno != EINTR)
+                        return -1;
 
         /* return child's termination status */
         return (WIFEXITED(status)) ? WEXITSTATUS(status) : -1;
 }
 
-
-void
-runcmd_timeout_alarm_handler (int signo)
-{
+void runcmd_timeout_alarm_handler(int signo) {
 
         if (signo == SIGALRM)
                 puts(_("CRITICAL - Plugin timed out while executing system call"));
 
-  long maxfd = mp_open_max();
-        if(np_pids) for(long int i = 0; i < maxfd; i++) {
-                if(np_pids[i] != 0) kill(np_pids[i], SIGKILL);
-        }
+        long maxfd = mp_open_max();
+        if (np_pids)
+                for (long int i = 0; i < maxfd; i++) {
+                        if (np_pids[i] != 0)
+                                kill(np_pids[i], SIGKILL);
+                }
 
-        exit (STATE_CRITICAL);
+        exit(STATE_CRITICAL);
 }
 
-
-static int
-np_fetch_output(int fd, output *op, int flags)
-{
+static int np_fetch_output(int fd, output *op, int flags) {
         size_t len = 0, i = 0, lineno = 0;
         size_t rsf = 6, ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */
         char *buf = NULL;
@@ -264,7 +254,7 @@ np_fetch_output(int fd, output *op, int flags)
 
         op->buf = NULL;
         op->buflen = 0;
-        while((ret = read(fd, tmpbuf, sizeof(tmpbuf))) > 0) {
+        while ((ret = read(fd, tmpbuf, sizeof(tmpbuf))) > 0) {
                 len = (size_t)ret;
                 op->buf = realloc(op->buf, op->buflen + len + 1);
                 memcpy(op->buf + op->buflen, tmpbuf, len);
@@ -272,33 +262,33 @@ np_fetch_output(int fd, output *op, int flags)
                 i++;
         }
 
-        if(ret < 0) {
+        if (ret < 0) {
                 printf("read() returned %d: %s\n", ret, strerror(errno));
                 return ret;
         }
 
         /* some plugins may want to keep output unbroken, and some commands
          * will yield no output, so return here for those */
-        if(flags & RUNCMD_NO_ARRAYS || !op->buf || !op->buflen)
+        if (flags & RUNCMD_NO_ARRAYS || !op->buf || !op->buflen)
                 return op->buflen;
 
         /* and some may want both */
-        if(flags & RUNCMD_NO_ASSOC) {
+        if (flags & RUNCMD_NO_ASSOC) {
                 buf = malloc(op->buflen);
                 memcpy(buf, op->buf, op->buflen);
-        }
-        else buf = op->buf;
+        } else
+                buf = op->buf;
 
         op->line = NULL;
         op->lens = NULL;
         i = 0;
-        while(i < op->buflen) {
+        while (i < op->buflen) {
                 /* make sure we have enough memory */
-                if(lineno >= ary_size) {
+                if (lineno >= ary_size) {
                         /* ary_size must never be zero */
                         do {
                                 ary_size = op->buflen >> --rsf;
-                        } while(!ary_size);
+                        } while (!ary_size);
 
                         op->line = realloc(op->line, ary_size * sizeof(char *));
                         op->lens = realloc(op->lens, ary_size * sizeof(size_t));
@@ -308,7 +298,8 @@ np_fetch_output(int fd, output *op, int flags)
                 op->line[lineno] = &buf[i];
 
                 /* hop to next newline or end of buffer */
-                while(buf[i] != '\n' && i < op->buflen) i++;
+                while (buf[i] != '\n' && i < op->buflen)
+                        i++;
                 buf[i] = '\0';
 
                 /* calculate the string length using pointer difference */
@@ -321,21 +312,22 @@ np_fetch_output(int fd, output *op, int flags)
         return lineno;
 }
 
-
-int
-np_runcmd(const char *cmd, output *out, output *err, int flags)
-{
+int np_runcmd(const char *cmd, output *out, output *err, int flags) {
         int fd, pfd_out[2], pfd_err[2];
 
         /* initialize the structs */
-        if(out) memset(out, 0, sizeof(output));
-        if(err) memset(err, 0, sizeof(output));
-
-        if((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1)
-                die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
-
-        if(out) out->lines = np_fetch_output(pfd_out[0], out, flags);
-        if(err) err->lines = np_fetch_output(pfd_err[0], err, flags);
+        if (out)
+                memset(out, 0, sizeof(output));
+        if (err)
+                memset(err, 0, sizeof(output));
+
+        if ((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1)
+                die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+
+        if (out)
+                out->lines = np_fetch_output(pfd_out[0], out, flags);
+        if (err)
+                err->lines = np_fetch_output(pfd_err[0], err, flags);
 
         return np_runcmd_close(fd);
 }
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 6bc0ba8..3c92841 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -1,46 +1,42 @@
 /*****************************************************************************
-*
-* Monitoring Plugins SSL utilities
-*
-* License: GPL
-* Copyright (c) 2005-2010 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains common functions for plugins that require SSL.
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring Plugins SSL utilities
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains common functions for plugins that require SSL.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #define MAX_CN_LENGTH 256
 #include "common.h"
 #include "netutils.h"
 
 #ifdef HAVE_SSL
-static SSL_CTX *ctx=NULL;
-static SSL *s=NULL;
+static SSL_CTX *ctx = NULL;
+static SSL *s = NULL;
 
-int np_net_ssl_init(int sd) {
-        return np_net_ssl_init_with_hostname(sd, NULL);
-}
+int np_net_ssl_init(int sd) { return np_net_ssl_init_with_hostname(sd, NULL); }
 
-int np_net_ssl_init_with_hostname(int sd, char *host_name) {
-        return np_net_ssl_init_with_hostname_and_version(sd, host_name, 0);
-}
+int np_net_ssl_init_with_hostname(int sd, char *host_name) { return np_net_ssl_init_with_hostname_and_version(sd, host_name, 0); }
 
 int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version) {
         return np_net_ssl_init_with_hostname_version_and_cert(sd, host_name, version, NULL, NULL);
@@ -59,145 +55,141 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
                 printf("%s\n", _("UNKNOWN - SSL protocol version 2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
         case MP_SSLv3: /* SSLv3 protocol */
-#if defined(OPENSSL_NO_SSL3)
+#       if defined(OPENSSL_NO_SSL3)
                 printf("%s\n", _("UNKNOWN - SSL protocol version 3 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, SSL3_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1: /* TLSv1 protocol */
-#if defined(OPENSSL_NO_TLS1)
+#       if defined(OPENSSL_NO_TLS1)
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, TLS1_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_1: /* TLSv1.1 protocol */
-#if !defined(SSL_OP_NO_TLSv1_1)
+#       if !defined(SSL_OP_NO_TLSv1_1)
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, TLS1_1_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_2: /* TLSv1.2 protocol */
-#if !defined(SSL_OP_NO_TLSv1_2)
+#       if !defined(SSL_OP_NO_TLSv1_2)
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1.2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_2_OR_NEWER:
-#if !defined(SSL_OP_NO_TLSv1_1)
+#       if !defined(SSL_OP_NO_TLSv1_1)
                 printf("%s\n", _("UNKNOWN - Disabling TLSv1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_1_OR_NEWER:
-#if !defined(SSL_OP_NO_TLSv1)
+#       if !defined(SSL_OP_NO_TLSv1)
                 printf("%s\n", _("UNKNOWN - Disabling TLSv1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_OR_NEWER:
-#if defined(SSL_OP_NO_SSLv3)
+#       if defined(SSL_OP_NO_SSLv3)
                 SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
                 break;
-#endif
+#       endif
         case MP_SSLv3_OR_NEWER:
-#if defined(SSL_OP_NO_SSLv2)
+#       if defined(SSL_OP_NO_SSLv2)
                 SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
                 break;
-#endif
+#       endif
         }
 
         if (cert && privkey) {
-#ifdef USE_OPENSSL
+#       ifdef USE_OPENSSL
                 if (!SSL_CTX_use_certificate_chain_file(ctx, cert)) {
-#elif  USE_GNUTLS
+#       elif USE_GNUTLS
                 if (!SSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM)) {
-#else
-#error Unported for unknown SSL library
-#endif
-                        printf ("%s\n", _("CRITICAL - Unable to open certificate chain file!\n"));
+#       else
+#               error Unported for unknown SSL library
+#       endif
+                        printf("%s\n", _("CRITICAL - Unable to open certificate chain file!\n"));
                         return STATE_CRITICAL;
                 }
                 SSL_CTX_use_PrivateKey_file(ctx, privkey, SSL_FILETYPE_PEM);
-#ifdef USE_OPENSSL
+#       ifdef USE_OPENSSL
                 if (!SSL_CTX_check_private_key(ctx)) {
-                        printf ("%s\n", _("CRITICAL - Private key does not seem to match certificate!\n"));
+                        printf("%s\n", _("CRITICAL - Private key does not seem to match certificate!\n"));
                         return STATE_CRITICAL;
                 }
-#endif
+#       endif
         }
-#ifdef SSL_OP_NO_TICKET
+#       ifdef SSL_OP_NO_TICKET
         options |= SSL_OP_NO_TICKET;
-#endif
+#       endif
         SSL_CTX_set_options(ctx, options);
         SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
         if ((s = SSL_new(ctx)) != NULL) {
-#ifdef SSL_set_tlsext_host_name
+#       ifdef SSL_set_tlsext_host_name
                 if (host_name != NULL)
                         SSL_set_tlsext_host_name(s, host_name);
-#endif
+#       endif
                 SSL_set_fd(s, sd);
                 if (SSL_connect(s) == 1) {
                         return OK;
                 } else {
                         printf("%s\n", _("CRITICAL - Cannot make SSL connection."));
-#  ifdef USE_OPENSSL /* XXX look into ERR_error_string */
+#       ifdef USE_OPENSSL /* XXX look into ERR_error_string */
                         ERR_print_errors_fp(stdout);
-#  endif /* USE_OPENSSL */
+#       endif /* USE_OPENSSL */
                 }
         } else {
-                        printf("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
+                printf("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
         }
         return STATE_CRITICAL;
 }
 
 void np_net_ssl_cleanup() {
         if (s) {
-#ifdef SSL_set_tlsext_host_name
+#       ifdef SSL_set_tlsext_host_name
                 SSL_set_tlsext_host_name(s, NULL);
-#endif
+#       endif
                 SSL_shutdown(s);
                 SSL_free(s);
                 if (ctx) {
                         SSL_CTX_free(ctx);
-                        ctx=NULL;
+                        ctx = NULL;
                 }
-                s=NULL;
+                s = NULL;
         }
 }
 
-int np_net_ssl_write(const void *buf, int num) {
-        return SSL_write(s, buf, num);
-}
+int np_net_ssl_write(const void *buf, int num) { return SSL_write(s, buf, num); }
 
-int np_net_ssl_read(void *buf, int num) {
-        return SSL_read(s, buf, num);
-}
+int np_net_ssl_read(void *buf, int num) { return SSL_read(s, buf, num); }
 
-int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int days_till_exp_crit){
-#  ifdef USE_OPENSSL
-        X509_NAME *subj=NULL;
+int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int days_till_exp_crit) {
+#       ifdef USE_OPENSSL
+        X509_NAME *subj = NULL;
         char timestamp[50] = "";
-        char cn[MAX_CN_LENGTH]= "";
+        char cn[MAX_CN_LENGTH] = "";
         char *tz;
 
-        int cnlen =-1;
-        int status=STATE_UNKNOWN;
+        int cnlen = -1;
+        int status = STATE_UNKNOWN;
 
         ASN1_STRING *tm;
         int offset;
@@ -208,15 +200,15 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         time_t tm_t;
 
         if (!certificate) {
-                printf("%s\n",_("CRITICAL - Cannot retrieve server certificate."));
+                printf("%s\n", _("CRITICAL - Cannot retrieve server certificate."));
                 return STATE_CRITICAL;
         }
 
         /* Extract CN from certificate subject */
-        subj=X509_get_subject_name(certificate);
+        subj = X509_get_subject_name(certificate);
 
         if (!subj) {
-                printf("%s\n",_("CRITICAL - Cannot retrieve certificate subject."));
+                printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
                 return STATE_CRITICAL;
         }
         cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, cn, sizeof(cn));
@@ -242,23 +234,16 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
                         printf("%s\n", _("CRITICAL - Wrong time format in certificate."));
                         return STATE_CRITICAL;
                 } else {
-                        stamp.tm_year =
-                                (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
-                                (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
+                        stamp.tm_year = (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 + (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
                         stamp.tm_year -= 1900;
                         offset = 2;
                 }
         }
-        stamp.tm_mon =
-                (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
-        stamp.tm_mday =
-                (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
-        stamp.tm_hour =
-                (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
-        stamp.tm_min =
-                (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
-        stamp.tm_sec =
-                (tm->data[10 + offset] - '0') * 10 + (tm->data[11 + offset] - '0');
+        stamp.tm_mon = (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
+        stamp.tm_mday = (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
+        stamp.tm_hour = (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
+        stamp.tm_min = (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
+        stamp.tm_sec = (tm->data[10 + offset] - '0') * 10 + (tm->data[11 + offset] - '0');
         stamp.tm_isdst = -1;
 
         tm_t = timegm(&stamp);
@@ -275,30 +260,30 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         tzset();
 
         if (days_left > 0 && days_left <= days_till_exp_warn) {
-                printf (_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", cn, days_left, timestamp);
+                printf(_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn,
+                           days_left, timestamp);
                 if (days_left > days_till_exp_crit)
                         status = STATE_WARNING;
                 else
                         status = STATE_CRITICAL;
         } else if (days_left == 0 && time_left > 0) {
                 if (time_left >= 3600)
-                        time_remaining = (int) time_left / 3600;
+                        time_remaining = (int)time_left / 3600;
                 else
-                        time_remaining = (int) time_left / 60;
+                        time_remaining = (int)time_left / 60;
 
-                printf (_("%s - Certificate '%s' expires in %u %s (%s)\n"),
-                        (days_left>days_till_exp_crit) ? "WARNING" : "CRITICAL", cn, time_remaining,
-                        time_left >= 3600 ? "hours" : "minutes", timestamp);
+                printf(_("%s - Certificate '%s' expires in %u %s (%s)\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn,
+                           time_remaining, time_left >= 3600 ? "hours" : "minutes", timestamp);
 
-                if ( days_left > days_till_exp_crit)
+                if (days_left > days_till_exp_crit)
                         status = STATE_WARNING;
                 else
                         status = STATE_CRITICAL;
         } else if (time_left < 0) {
                 printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), cn, timestamp);
-                status=STATE_CRITICAL;
+                status = STATE_CRITICAL;
         } else if (days_left == 0) {
-                printf (_("%s - Certificate '%s' just expired (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", cn, timestamp);
+                printf(_("%s - Certificate '%s' just expired (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn, timestamp);
                 if (days_left > days_till_exp_crit)
                         status = STATE_WARNING;
                 else
@@ -309,22 +294,21 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         }
         X509_free(certificate);
         return status;
-#  else /* ifndef USE_OPENSSL */
+#       else  /* ifndef USE_OPENSSL */
         printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
         return STATE_WARNING;
-#  endif /* USE_OPENSSL */
+#       endif /* USE_OPENSSL */
 }
 
-int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
-#  ifdef USE_OPENSSL
+int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit) {
+#       ifdef USE_OPENSSL
         X509 *certificate = NULL;
-        certificate=SSL_get_peer_certificate(s);
-        return(np_net_ssl_check_certificate(certificate, days_till_exp_warn, days_till_exp_crit));
-#  else /* ifndef USE_OPENSSL */
+        certificate = SSL_get_peer_certificate(s);
+        return (np_net_ssl_check_certificate(certificate, days_till_exp_warn, days_till_exp_crit));
+#       else  /* ifndef USE_OPENSSL */
         printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
         return STATE_WARNING;
-#  endif /* USE_OPENSSL */
+#       endif /* USE_OPENSSL */
 }
 
-
 #endif /* HAVE_SSL */
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 6fda72d..1aa4e42 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -1,51 +1,49 @@
 /*****************************************************************************
-* 
-* Monitoring urlize plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the urlize plugin
-* 
-* This plugin wraps the text output of another command (plugin) in HTML <A>
-* tags.  This plugin returns the status of the invoked plugin.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring urlize plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the urlize plugin
+ *
+ * This plugin wraps the text output of another command (plugin) in HTML <A>
+ * tags.  This plugin returns the status of the invoked plugin.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "urlize";
-const char *copyright = "2000-2006";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "popen.h"
 
-#define PERF_CHARACTER "|"
+#define PERF_CHARACTER    "|"
 #define NEWLINE_CHARACTER '\n'
 
-void print_help (void);
-void print_usage (void);
+void print_help(void);
+void print_usage(void);
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int found = 0, result = STATE_UNKNOWN;
         char *url = NULL;
         char *cmd;
@@ -56,79 +54,72 @@ main (int argc, char **argv)
         int c;
         int option = 0;
         static struct option longopts[] = {
-                {"help", no_argument, 0, 'h'},
-                {"version", no_argument, 0, 'V'},
-                {"url", required_argument, 0, 'u'},
-                {0, 0, 0, 0}
-        };
+                {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, {"url", required_argument, 0, 'u'}, {0, 0, 0, 0}};
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Need at least 2 args */
         if (argc < 3) {
                 print_help();
-                exit (STATE_UNKNOWN);
+                exit(STATE_UNKNOWN);
         }
 
         while (1) {
-                c = getopt_long (argc, argv, "+hVu:", longopts, &option);
+                c = getopt_long(argc, argv, "+hVu:", longopts, &option);
 
                 if (c == -1 || c == EOF)
                         break;
 
                 switch (c) {
-                case 'h':     /* help */
-                        print_help ();
-                        exit (EXIT_SUCCESS);
+                case 'h': /* help */
+                        print_help();
+                        exit(EXIT_SUCCESS);
                         break;
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (EXIT_SUCCESS);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(EXIT_SUCCESS);
                         break;
                 case 'u':
-                        url = strdup (argv[optind]);
+                        url = strdup(argv[optind]);
                         break;
                 case '?':
                 default:
-                        usage5 ();
+                        usage5();
                 }
         }
 
         if (url == NULL)
-                url = strdup (argv[optind++]);
+                url = strdup(argv[optind++]);
 
-        cmd = strdup (argv[optind++]);
+        cmd = strdup(argv[optind++]);
         for (c = optind; c < argc; c++) {
-                xasprintf (&cmd, "%s %s", cmd, argv[c]);
+                xasprintf(&cmd, "%s %s", cmd, argv[c]);
         }
 
-        child_process = spopen (cmd);
+        child_process = spopen(cmd);
         if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), cmd);
-                exit (STATE_UNKNOWN);
+                printf(_("Could not open pipe: %s\n"), cmd);
+                exit(STATE_UNKNOWN);
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL) {
-                printf (_("Could not open stderr for %s\n"), cmd);
+                printf(_("Could not open stderr for %s\n"), cmd);
         }
 
         bzero(tstr, sizeof(tstr));
         buf = malloc(MAX_INPUT_BUFFER);
-        printf ("<A href=\"%s\">", argv[1]);
-        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+        printf("<A href=\"%s\">", argv[1]);
+        while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) {
                 found++;
                 /* Collect the string in temp str so we can tokenize */
                 strcat(tstr, buf);
         }
 
         if (!found)
-                die (STATE_UNKNOWN,
-                     _("%s UNKNOWN - No data received from host\nCMD: %s</A>\n"),
-                     argv[0], cmd);
-
+                die(STATE_UNKNOWN, _("%s UNKNOWN - No data received from host\nCMD: %s</A>\n"), argv[0], cmd);
 
         /* chop the newline character */
         if ((nstr = strchr(tstr, NEWLINE_CHARACTER)) != NULL)
@@ -136,63 +127,55 @@ main (int argc, char **argv)
 
         /* tokenize the string for Perfdata if there is some */
         nstr = strtok(tstr, PERF_CHARACTER);
-        printf ("%s", nstr);
-        printf ("</A>");
+        printf("%s", nstr);
+        printf("</A>");
         nstr = strtok(NULL, PERF_CHARACTER);
         if (nstr != NULL)
-                printf (" | %s", nstr);
+                printf(" | %s", nstr);
 
         /* close the pipe */
-        result = spclose (child_process);
+        result = spclose(child_process);
 
         /* WARNING if output found on stderr */
-        if (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
-                result = max_state (result, STATE_WARNING);
+        if (fgets(buf, MAX_INPUT_BUFFER - 1, child_stderr))
+                result = max_state(result, STATE_WARNING);
 
         /* close stderr */
-        (void) fclose (child_stderr);
+        (void)fclose(child_stderr);
 
         return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
+        printf(COPYRIGHT, copyright, email);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf ("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML <A>"));
-  printf ("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible"));
-  printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin."));
+        printf("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML <A>"));
+        printf("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible"));
+        printf("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin."));
 
-  printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-  printf (UT_HELP_VRSN);
+        printf(UT_HELP_VRSN);
 
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-        printf ("%s\n", _("Pay close attention to quoting to ensure that the shell passes the expected"));
-  printf ("%s\n\n", _("data to the plugin. For example, in:"));
-  printf (" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r 'two words'"));
-  printf ("    %s\n", _("the shell will remove the single quotes and urlize will see:"));
-  printf (" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r two words"));
-  printf ("    %s\n\n", _("You probably want:"));
-  printf (" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf("%s\n", _("Pay close attention to quoting to ensure that the shell passes the expected"));
+        printf("%s\n\n", _("data to the plugin. For example, in:"));
+        printf(" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r 'two words'"));
+        printf("    %s\n", _("the shell will remove the single quotes and urlize will see:"));
+        printf(" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r two words"));
+        printf("    %s\n\n", _("You probably want:"));
+        printf(" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s <url> <plugin> <arg1> ... <argN>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s <url> <plugin> <arg1> ... <argN>\n", progname);
 }
diff --git a/plugins/utils.c b/plugins/utils.c
index 77d6a6f..f11db73 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -1,26 +1,26 @@
 /*****************************************************************************
-* 
-* Library of useful functions for plugins
-* 
-* License: GPL
-* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
-* Copyright (c) 2002-2007 Monitoring Plugins Development Team
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Library of useful functions for plugins
+ *
+ * License: GPL
+ * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "./utils.h"
@@ -34,7 +34,7 @@
 
 #include <arpa/inet.h>
 
-extern void print_usage (void);
+extern void print_usage(void);
 extern const char *progname;
 
 #define STRLEN 64
@@ -50,9 +50,7 @@ time_t start_time, end_time;
  * Note that numerically the above does not hold
  ****************************************************************************/
 
-int
-max_state (int a, int b)
-{
+int max_state(int a, int b) {
         if (a == STATE_CRITICAL || b == STATE_CRITICAL)
                 return STATE_CRITICAL;
         else if (a == STATE_WARNING || b == STATE_WARNING)
@@ -64,7 +62,7 @@ max_state (int a, int b)
         else if (a == STATE_DEPENDENT || b == STATE_DEPENDENT)
                 return STATE_DEPENDENT;
         else
-                return max (a, b);
+                return max(a, b);
 }
 
 /* **************************************************************************
@@ -77,9 +75,7 @@ max_state (int a, int b)
  * non-OK state.
  ****************************************************************************/
 
-int
-max_state_alt (int a, int b)
-{
+int max_state_alt(int a, int b) {
         if (a == STATE_CRITICAL || b == STATE_CRITICAL)
                 return STATE_CRITICAL;
         else if (a == STATE_WARNING || b == STATE_WARNING)
@@ -91,124 +87,112 @@ max_state_alt (int a, int b)
         else if (a == STATE_OK || b == STATE_OK)
                 return STATE_OK;
         else
-                return max (a, b);
+                return max(a, b);
 }
 
-void usage (const char *msg)
-{
-        printf ("%s\n", msg);
-        print_usage ();
-        exit (STATE_UNKNOWN);
+void usage(const char *msg) {
+        printf("%s\n", msg);
+        print_usage();
+        exit(STATE_UNKNOWN);
 }
 
-void usage_va (const char *fmt, ...)
-{
+void usage_va(const char *fmt, ...) {
         va_list ap;
         printf("%s: ", progname);
         va_start(ap, fmt);
         vprintf(fmt, ap);
         va_end(ap);
         printf("\n");
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void usage2(const char *msg, const char *arg)
-{
-        printf ("%s: %s - %s\n", progname, msg, arg?arg:"(null)" );
-        print_usage ();
-        exit (STATE_UNKNOWN);
+void usage2(const char *msg, const char *arg) {
+        printf("%s: %s - %s\n", progname, msg, arg ? arg : "(null)");
+        print_usage();
+        exit(STATE_UNKNOWN);
 }
 
-void
-usage3 (const char *msg, int arg)
-{
-        printf ("%s: %s - %c\n", progname, msg, arg);
+void usage3(const char *msg, int arg) {
+        printf("%s: %s - %c\n", progname, msg, arg);
         print_usage();
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void
-usage4 (const char *msg)
-{
-        printf ("%s: %s\n", progname, msg);
+void usage4(const char *msg) {
+        printf("%s: %s\n", progname, msg);
         print_usage();
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void
-usage5 (void)
-{
+void usage5(void) {
         print_usage();
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void
-print_revision (const char *command_name, const char *revision)
-{
-        printf ("%s v%s (%s %s)\n",
-                 command_name, revision, PACKAGE, VERSION);
+void print_revision(const char *command_name, const char *revision) {
+        printf("%s v%s (%s %s)\n", command_name, revision, PACKAGE, VERSION);
 }
 
-bool is_numeric (char *number) {
+bool is_numeric(char *number) {
         char tmp[1];
         float x;
 
         if (!number)
                 return false;
-        else if (sscanf (number, "%f%c", &x, tmp) == 1)
+        else if (sscanf(number, "%f%c", &x, tmp) == 1)
                 return true;
         else
                 return false;
 }
 
-bool is_positive (char *number) {
-        if (is_numeric (number) && atof (number) > 0.0)
+bool is_positive(char *number) {
+        if (is_numeric(number) && atof(number) > 0.0)
                 return true;
         else
                 return false;
 }
 
-bool is_negative (char *number) {
-        if (is_numeric (number) && atof (number) < 0.0)
+bool is_negative(char *number) {
+        if (is_numeric(number) && atof(number) < 0.0)
                 return true;
         else
                 return false;
 }
 
-bool is_nonnegative (char *number) {
-        if (is_numeric (number) && atof (number) >= 0.0)
+bool is_nonnegative(char *number) {
+        if (is_numeric(number) && atof(number) >= 0.0)
                 return true;
         else
                 return false;
 }
 
-bool is_percentage (char *number) {
+bool is_percentage(char *number) {
         int x;
-        if (is_numeric (number) && (x = atof (number)) >= 0 && x <= 100)
+        if (is_numeric(number) && (x = atof(number)) >= 0 && x <= 100)
                 return true;
         else
                 return false;
 }
 
-bool is_percentage_expression (const char str[]) {
+bool is_percentage_expression(const char str[]) {
         if (!str) {
                 return false;
         }
 
         size_t len = strlen(str);
 
-        if (str[len-1] != '%') {
+        if (str[len - 1] != '%') {
                 return false;
         }
 
         char *foo = calloc(sizeof(char), len + 1);
 
         if (!foo) {
-                die (STATE_UNKNOWN, _("calloc failed \n"));
+                die(STATE_UNKNOWN, _("calloc failed \n"));
         }
 
         strcpy(foo, str);
-        foo[len-1] = '\0';
+        foo[len - 1] = '\0';
 
         bool result = is_numeric(foo);
 
@@ -217,13 +201,13 @@ bool is_percentage_expression (const char str[]) {
         return result;
 }
 
-bool is_integer (char *number) {
+bool is_integer(char *number) {
         long int n;
 
-        if (!number || (strspn (number, "-0123456789 ") != strlen (number)))
+        if (!number || (strspn(number, "-0123456789 ") != strlen(number)))
                 return false;
 
-        n = strtol (number, NULL, 10);
+        n = strtol(number, NULL, 10);
 
         if (errno != ERANGE && n >= INT_MIN && n <= INT_MAX)
                 return true;
@@ -231,22 +215,22 @@ bool is_integer (char *number) {
                 return false;
 }
 
-bool is_intpos (char *number) {
-        if (is_integer (number) && atoi (number) > 0)
+bool is_intpos(char *number) {
+        if (is_integer(number) && atoi(number) > 0)
                 return true;
         else
                 return false;
 }
 
-bool is_intneg (char *number) {
-        if (is_integer (number) && atoi (number) < 0)
+bool is_intneg(char *number) {
+        if (is_integer(number) && atoi(number) < 0)
                 return true;
         else
                 return false;
 }
 
-bool is_intnonneg (char *number) {
-        if (is_integer (number) && atoi (number) >= 0)
+bool is_intnonneg(char *number) {
+        if (is_integer(number) && atoi(number) >= 0)
                 return true;
         else
                 return false;
@@ -259,7 +243,7 @@ bool is_intnonneg (char *number) {
  */
 bool is_int64(char *number, int64_t *target) {
         errno = 0;
-        char *endptr = { 0 };
+        char *endptr = {0};
 
         int64_t tmp = strtoll(number, &endptr, 10);
         if (errno != 0) {
@@ -287,7 +271,7 @@ bool is_int64(char *number, int64_t *target) {
  */
 bool is_uint64(char *number, uint64_t *target) {
         errno = 0;
-        char *endptr = { 0 };
+        char *endptr = {0};
         unsigned long long tmp = strtoull(number, &endptr, 10);
 
         if (errno != 0) {
@@ -309,66 +293,50 @@ bool is_uint64(char *number, uint64_t *target) {
         return true;
 }
 
-bool is_intpercent (char *number) {
+bool is_intpercent(char *number) {
         int i;
-        if (is_integer (number) && (i = atoi (number)) >= 0 && i <= 100)
+        if (is_integer(number) && (i = atoi(number)) >= 0 && i <= 100)
                 return true;
         else
                 return false;
 }
 
-bool is_option (char *str) {
+bool is_option(char *str) {
         if (!str)
                 return false;
-        else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
+        else if (strspn(str, "-") == 1 || strspn(str, "-") == 2)
                 return true;
         else
                 return false;
 }
 
 #ifdef NEED_GETTIMEOFDAY
-int
-gettimeofday (struct timeval *tv, struct timezone *tz)
-{
+int gettimeofday(struct timeval *tv, struct timezone *tz) {
         tv->tv_usec = 0;
-        tv->tv_sec = (long) time ((time_t) 0);
+        tv->tv_sec = (long)time((time_t)0);
 }
 #endif
 
-
-
-double
-delta_time (struct timeval tv)
-{
+double delta_time(struct timeval tv) {
         struct timeval now;
 
-        gettimeofday (&now, NULL);
+        gettimeofday(&now, NULL);
         return ((double)(now.tv_sec - tv.tv_sec) + (double)(now.tv_usec - tv.tv_usec) / (double)1000000);
 }
 
-
-
-long
-deltime (struct timeval tv)
-{
+long deltime(struct timeval tv) {
         struct timeval now;
-        gettimeofday (&now, NULL);
-        return (now.tv_sec - tv.tv_sec)*1000000 + now.tv_usec - tv.tv_usec;
+        gettimeofday(&now, NULL);
+        return (now.tv_sec - tv.tv_sec) * 1000000 + now.tv_usec - tv.tv_usec;
 }
 
-
-
-
-void
-strip (char *buffer)
-{
+void strip(char *buffer) {
         size_t x;
         int i;
 
-        for (x = strlen (buffer); x >= 1; x--) {
+        for (x = strlen(buffer); x >= 1; x--) {
                 i = x - 1;
-                if (buffer[i] == ' ' ||
-                                buffer[i] == '\r' || buffer[i] == '\n' || buffer[i] == '\t')
+                if (buffer[i] == ' ' || buffer[i] == '\r' || buffer[i] == '\n' || buffer[i] == '\t')
                         buffer[i] = '\0';
                 else
                         break;
@@ -376,7 +344,6 @@ strip (char *buffer)
         return;
 }
 
-
 /******************************************************************************
  *
  * Copies one string to another. Any previously existing data in
@@ -389,19 +356,15 @@ strip (char *buffer)
  *
  *****************************************************************************/
 
-char *
-strscpy (char *dest, const char *src)
-{
+char *strscpy(char *dest, const char *src) {
         if (src == NULL)
                 return NULL;
 
-        xasprintf (&dest, "%s", src);
+        xasprintf(&dest, "%s", src);
 
         return dest;
 }
 
-
-
 /******************************************************************************
  *
  * Returns a pointer to the next line of a multiline string buffer
@@ -418,7 +381,7 @@ strscpy (char *dest, const char *src)
  * This
  * is
  * a
- * 
+ *
  * multiline string buffer
  * ==============================
  *
@@ -431,7 +394,7 @@ strscpy (char *dest, const char *src)
  *   printf("%d %s",i++,firstword(ptr));
  *   ptr = strnl(ptr);
  * }
- * 
+ *
  * Produces the following:
  *
  * 1 This
@@ -452,25 +415,22 @@ strscpy (char *dest, const char *src)
  *
  *****************************************************************************/
 
-char *
-strnl (char *str)
-{
+char *strnl(char *str) {
         size_t len;
         if (str == NULL)
                 return NULL;
-        str = strpbrk (str, "\r\n");
+        str = strpbrk(str, "\r\n");
         if (str == NULL)
                 return NULL;
-        len = strspn (str, "\r\n");
+        len = strspn(str, "\r\n");
         if (str[len] == '\0')
                 return NULL;
         str += len;
-        if (strlen (str) == 0)
+        if (strlen(str) == 0)
                 return NULL;
         return str;
 }
 
-
 /******************************************************************************
  *
  * Like strscpy, except only the portion of the source string up to
@@ -487,29 +447,25 @@ strnl (char *str)
  *
  *****************************************************************************/
 
-char *
-strpcpy (char *dest, const char *src, const char *str)
-{
+char *strpcpy(char *dest, const char *src, const char *str) {
         size_t len;
 
         if (src)
-                len = strcspn (src, str);
+                len = strcspn(src, str);
         else
                 return NULL;
 
-        if (dest == NULL || strlen (dest) < len)
-                dest = realloc (dest, len + 1);
+        if (dest == NULL || strlen(dest) < len)
+                dest = realloc(dest, len + 1);
         if (dest == NULL)
-                die (STATE_UNKNOWN, _("failed realloc in strpcpy\n"));
+                die(STATE_UNKNOWN, _("failed realloc in strpcpy\n"));
 
-        strncpy (dest, src, len);
+        strncpy(dest, src, len);
         dest[len] = '\0';
 
         return dest;
 }
 
-
-
 /******************************************************************************
  *
  * Like strscat, except only the portion of the source string up to
@@ -518,62 +474,54 @@ strpcpy (char *dest, const char *src, const char *str)
  * str = strpcpy(str,"This is a line of text with no trailing newline","x");
  * str = strpcat(str,"This is a line of text with no trailing newline","x");
  * printf("%s\n",str);
- * 
+ *
  *This is a line of texThis is a line of tex
  *
  *****************************************************************************/
 
-char *
-strpcat (char *dest, const char *src, const char *str)
-{
+char *strpcat(char *dest, const char *src, const char *str) {
         size_t len, l2;
 
         if (dest)
-                len = strlen (dest);
+                len = strlen(dest);
         else
                 len = 0;
 
         if (src) {
-                l2 = strcspn (src, str);
-        }
-        else {
+                l2 = strcspn(src, str);
+        } else {
                 return dest;
         }
 
-        dest = realloc (dest, len + l2 + 1);
+        dest = realloc(dest, len + l2 + 1);
         if (dest == NULL)
-                die (STATE_UNKNOWN, _("failed malloc in strscat\n"));
+                die(STATE_UNKNOWN, _("failed malloc in strscat\n"));
 
-        strncpy (dest + len, src, l2);
+        strncpy(dest + len, src, l2);
         dest[len + l2] = '\0';
 
         return dest;
 }
 
-
 /******************************************************************************
  *
  * asprintf, but die on failure
  *
  ******************************************************************************/
 
-int
-xvasprintf (char **strp, const char *fmt, va_list ap)
-{
-        int result = vasprintf (strp, fmt, ap);
+int xvasprintf(char **strp, const char *fmt, va_list ap) {
+        int result = vasprintf(strp, fmt, ap);
         if (result == -1 || *strp == NULL)
-                die (STATE_UNKNOWN, _("failed malloc in xvasprintf\n"));
+                die(STATE_UNKNOWN, _("failed malloc in xvasprintf\n"));
         return result;
 }
 
-int
-xasprintf (char **strp, const char *fmt, ...)
-{
+int xasprintf(char **strp, const char *fmt, ...) {
         va_list ap;
         int result;
-        va_start (ap, fmt);
-        result = xvasprintf (strp, fmt, ap);
-        va_end (ap);
+        va_start(ap, fmt);
+        result = xvasprintf(strp, fmt, ap);
+        va_end(ap);
         return result;
 }
 
@@ -583,247 +531,192 @@ xasprintf (char **strp, const char *fmt, ...)
  *
  ******************************************************************************/
 
-char *perfdata (const char *label,
- long int val,
- const char *uom,
- int warnp,
- long int warn,
- int critp,
- long int crit,
- int minp,
- long int minv,
- int maxp,
- long int maxv)
-{
+char *perfdata(const char *label, long int val, const char *uom, int warnp, long int warn, int critp, long int crit, int minp,
+                           long int minv, int maxp, long int maxv) {
         char *data = NULL;
 
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%ld%s;", label, val, uom);
+        if (strpbrk(label, "'= "))
+                xasprintf(&data, "'%s'=%ld%s;", label, val, uom);
         else
-                xasprintf (&data, "%s=%ld%s;", label, val, uom);
+                xasprintf(&data, "%s=%ld%s;", label, val, uom);
 
         if (warnp)
-                xasprintf (&data, "%s%ld;", data, warn);
+                xasprintf(&data, "%s%ld;", data, warn);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (critp)
-                xasprintf (&data, "%s%ld;", data, crit);
+                xasprintf(&data, "%s%ld;", data, crit);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%ld;", data, minv);
+                xasprintf(&data, "%s%ld;", data, minv);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (maxp)
-                xasprintf (&data, "%s%ld", data, maxv);
+                xasprintf(&data, "%s%ld", data, maxv);
 
         return data;
 }
 
-
-char *perfdata_uint64 (const char *label,
- uint64_t val,
- const char *uom,
- int warnp, /* Warning present */
- uint64_t warn,
- int critp, /* Critical present */
- uint64_t crit,
- int minp, /* Minimum present */
- uint64_t minv,
- int maxp, /* Maximum present */
- uint64_t maxv)
-{
+char *perfdata_uint64(const char *label, uint64_t val, const char *uom, int warnp, /* Warning present */
+                                          uint64_t warn, int critp,                                    /* Critical present */
+                                          uint64_t crit, int minp,                                     /* Minimum present */
+                                          uint64_t minv, int maxp,                                     /* Maximum present */
+                                          uint64_t maxv) {
         char *data = NULL;
 
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%" PRIu64 "%s;", label, val, uom);
+        if (strpbrk(label, "'= "))
+                xasprintf(&data, "'%s'=%" PRIu64 "%s;", label, val, uom);
         else
-                xasprintf (&data, "%s=%" PRIu64 "%s;", label, val, uom);
+                xasprintf(&data, "%s=%" PRIu64 "%s;", label, val, uom);
 
         if (warnp)
-                xasprintf (&data, "%s%" PRIu64 ";", data, warn);
+                xasprintf(&data, "%s%" PRIu64 ";", data, warn);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (critp)
-                xasprintf (&data, "%s%" PRIu64 ";", data, crit);
+                xasprintf(&data, "%s%" PRIu64 ";", data, crit);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%" PRIu64 ";", data, minv);
+                xasprintf(&data, "%s%" PRIu64 ";", data, minv);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (maxp)
-                xasprintf (&data, "%s%" PRIu64, data, maxv);
+                xasprintf(&data, "%s%" PRIu64, data, maxv);
 
         return data;
 }
 
-
-char *perfdata_int64 (const char *label,
- int64_t val,
- const char *uom,
- int warnp, /* Warning present */
- int64_t warn,
- int critp, /* Critical present */
- int64_t crit,
- int minp, /* Minimum present */
- int64_t minv,
- int maxp, /* Maximum present */
- int64_t maxv)
-{
+char *perfdata_int64(const char *label, int64_t val, const char *uom, int warnp, /* Warning present */
+                                         int64_t warn, int critp,                                    /* Critical present */
+                                         int64_t crit, int minp,                                     /* Minimum present */
+                                         int64_t minv, int maxp,                                     /* Maximum present */
+                                         int64_t maxv) {
         char *data = NULL;
 
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%" PRId64 "%s;", label, val, uom);
+        if (strpbrk(label, "'= "))
+                xasprintf(&data, "'%s'=%" PRId64 "%s;", label, val, uom);
         else
-                xasprintf (&data, "%s=%" PRId64 "%s;", label, val, uom);
+                xasprintf(&data, "%s=%" PRId64 "%s;", label, val, uom);
 
         if (warnp)
-                xasprintf (&data, "%s%" PRId64 ";", data, warn);
+                xasprintf(&data, "%s%" PRId64 ";", data, warn);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (critp)
-                xasprintf (&data, "%s%" PRId64 ";", data, crit);
+                xasprintf(&data, "%s%" PRId64 ";", data, crit);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%" PRId64 ";", data, minv);
+                xasprintf(&data, "%s%" PRId64 ";", data, minv);
         else
-                xasprintf (&data, "%s;", data);
+                xasprintf(&data, "%s;", data);
 
         if (maxp)
-                xasprintf (&data, "%s%" PRId64, data, maxv);
+                xasprintf(&data, "%s%" PRId64, data, maxv);
 
         return data;
 }
 
-
-char *fperfdata (const char *label,
- double val,
- const char *uom,
- int warnp,
- double warn,
- int critp,
- double crit,
- int minp,
- double minv,
- int maxp,
- double maxv)
-{
+char *fperfdata(const char *label, double val, const char *uom, int warnp, double warn, int critp, double crit, int minp, double minv,
+                                int maxp, double maxv) {
         char *data = NULL;
 
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=", label);
+        if (strpbrk(label, "'= "))
+                xasprintf(&data, "'%s'=", label);
         else
-                xasprintf (&data, "%s=", label);
+                xasprintf(&data, "%s=", label);
 
-        xasprintf (&data, "%s%f", data, val);
-        xasprintf (&data, "%s%s;", data, uom);
+        xasprintf(&data, "%s%f", data, val);
+        xasprintf(&data, "%s%s;", data, uom);
 
         if (warnp)
-                xasprintf (&data, "%s%f", data, warn);
+                xasprintf(&data, "%s%f", data, warn);
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
         if (critp)
-                xasprintf (&data, "%s%f", data, crit);
+                xasprintf(&data, "%s%f", data, crit);
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%f", data, minv);
+                xasprintf(&data, "%s%f", data, minv);
 
         if (maxp) {
-                xasprintf (&data, "%s;", data);
-                xasprintf (&data, "%s%f", data, maxv);
+                xasprintf(&data, "%s;", data);
+                xasprintf(&data, "%s%f", data, maxv);
         }
 
         return data;
 }
 
-char *sperfdata (const char *label,
- double val,
- const char *uom,
- char *warn,
- char *crit,
- int minp,
- double minv,
- int maxp,
- double maxv)
-{
+char *sperfdata(const char *label, double val, const char *uom, char *warn, char *crit, int minp, double minv, int maxp, double maxv) {
         char *data = NULL;
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=", label);
+        if (strpbrk(label, "'= "))
+                xasprintf(&data, "'%s'=", label);
         else
-                xasprintf (&data, "%s=", label);
+                xasprintf(&data, "%s=", label);
 
-        xasprintf (&data, "%s%f", data, val);
-        xasprintf (&data, "%s%s;", data, uom);
+        xasprintf(&data, "%s%f", data, val);
+        xasprintf(&data, "%s%s;", data, uom);
 
-        if (warn!=NULL)
-                xasprintf (&data, "%s%s", data, warn);
+        if (warn != NULL)
+                xasprintf(&data, "%s%s", data, warn);
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (crit!=NULL)
-                xasprintf (&data, "%s%s", data, crit);
+        if (crit != NULL)
+                xasprintf(&data, "%s%s", data, crit);
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%f", data, minv);
+                xasprintf(&data, "%s%f", data, minv);
 
         if (maxp) {
-                xasprintf (&data, "%s;", data);
-                xasprintf (&data, "%s%f", data, maxv);
+                xasprintf(&data, "%s;", data);
+                xasprintf(&data, "%s%f", data, maxv);
         }
 
         return data;
 }
 
-char *sperfdata_int (const char *label,
- int val,
- const char *uom,
- char *warn,
- char *crit,
- int minp,
- int minv,
- int maxp,
- int maxv)
-{
+char *sperfdata_int(const char *label, int val, const char *uom, char *warn, char *crit, int minp, int minv, int maxp, int maxv) {
         char *data = NULL;
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=", label);
+        if (strpbrk(label, "'= "))
+                xasprintf(&data, "'%s'=", label);
         else
-                xasprintf (&data, "%s=", label);
+                xasprintf(&data, "%s=", label);
 
-        xasprintf (&data, "%s%d", data, val);
-        xasprintf (&data, "%s%s;", data, uom);
+        xasprintf(&data, "%s%d", data, val);
+        xasprintf(&data, "%s%s;", data, uom);
 
-        if (warn!=NULL)
-                xasprintf (&data, "%s%s", data, warn);
+        if (warn != NULL)
+                xasprintf(&data, "%s%s", data, warn);
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (crit!=NULL)
-                xasprintf (&data, "%s%s", data, crit);
+        if (crit != NULL)
+                xasprintf(&data, "%s%s", data, crit);
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
         if (minp)
-                xasprintf (&data, "%s%d", data, minv);
+                xasprintf(&data, "%s%d", data, minv);
 
         if (maxp) {
-                xasprintf (&data, "%s;", data);
-                xasprintf (&data, "%s%d", data, maxv);
+                xasprintf(&data, "%s;", data);
+                xasprintf(&data, "%s%d", data, maxv);
         }
 
         return data;