Merge pull request #2035 from RincewindsHat/cleanup/rest-of-plugins

Cleanup for some more plugins

1 files changed, 117 insertions, 138 deletions

diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index e1ede9f7..b40c38c7 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");
-
 }
-