Merge pull request #2043 from RincewindsHat/cleanup/leftovers

Cleanup/leftovers

11 files changed, 201 insertions, 209 deletions

diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 381dbd80..9640ef70 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -113,12 +113,10 @@ typedef struct values_s {
         __u8 checksum;
 } __attribute__((packed)) values_t;
 
-struct {
+static struct {
         __u8 value;
         char *text;
-}
-
-static offline_status_text[] = {{0x00, "NeverStarted"}, {0x02, "Completed"}, {0x04, "Suspended"},
+} offline_status_text[] = {{0x00, "NeverStarted"}, {0x02, "Completed"}, {0x04, "Suspended"},
                                                                 {0x05, "Aborted"},      {0x06, "Failed"},    {0, 0}};
 
 static struct {
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 1c728292..87818da6 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -47,37 +47,37 @@ enum {
         DEFAULT_PORT = 389
 };
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
+static int process_arguments (int, char **);
+static int validate_arguments (void);
+static void print_help (void);
 void print_usage (void);
 
-char ld_defattr[] = "(objectclass=*)";
-char *ld_attr = ld_defattr;
-char *ld_host = NULL;
-char *ld_base = NULL;
-char *ld_passwd = NULL;
-char *ld_binddn = NULL;
-int ld_port = -1;
+static char ld_defattr[] = "(objectclass=*)";
+static char *ld_attr = ld_defattr;
+static char *ld_host = NULL;
+static char *ld_base = NULL;
+static char *ld_passwd = NULL;
+static char *ld_binddn = NULL;
+static int ld_port = -1;
 #ifdef HAVE_LDAP_SET_OPTION
-int ld_protocol = DEFAULT_PROTOCOL;
+static int ld_protocol = DEFAULT_PROTOCOL;
 #endif
 #ifndef LDAP_OPT_SUCCESS
 # define LDAP_OPT_SUCCESS LDAP_SUCCESS
 #endif
-double warn_time = UNDEFINED;
-double crit_time = UNDEFINED;
-thresholds *entries_thresholds = NULL;
-struct timeval tv;
-char* warn_entries = NULL;
-char* crit_entries = NULL;
-bool starttls = false;
-bool ssl_on_connect = false;
-bool verbose = false;
+static double warn_time = UNDEFINED;
+static double crit_time = UNDEFINED;
+static thresholds *entries_thresholds = NULL;
+static struct timeval tv;
+static char* warn_entries = NULL;
+static char* crit_entries = NULL;
+static bool starttls = false;
+static bool ssl_on_connect = false;
+static bool verbose = false;
 
 /* for ldap tls */
 
-char *SERVICE = "LDAP";
+static char *SERVICE = "LDAP";
 
 int
 main (int argc, char *argv[])
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 1f0b7099..8a73772d 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -45,23 +45,23 @@ const char *email = "devel@monitoring-plugins.org";
 #include <mysqld_error.h>
 #include <errmsg.h>
 
-char *db_user = NULL;
-char *db_host = NULL;
-char *db_socket = NULL;
-char *db_pass = NULL;
-char *db = NULL;
-char *ca_cert = NULL;
-char *ca_dir = NULL;
-char *cert = NULL;
-char *key = NULL;
-char *ciphers = NULL;
-bool ssl = false;
-char *opt_file = NULL;
-char *opt_group = NULL;
-unsigned int db_port = MYSQL_PORT;
-bool check_slave = false;
-bool ignore_auth = false;
-int verbose = 0;
+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 *ca_cert = NULL;
+static char *ca_dir = NULL;
+static char *cert = NULL;
+static char *key = NULL;
+static char *ciphers = NULL;
+static bool ssl = false;
+static char *opt_file = NULL;
+static char *opt_group = NULL;
+static unsigned int db_port = MYSQL_PORT;
+static bool check_slave = false;
+static bool ignore_auth = false;
+static int verbose = 0;
 
 static double warning_time = 0;
 static double critical_time = 0;
@@ -91,11 +91,11 @@ static const char *metric_counter[LENGTH_METRIC_COUNTER] = {
 
 #define MYSQLDUMP_THREADS_QUERY "SELECT COUNT(1) mysqldumpThreads FROM information_schema.processlist WHERE info LIKE 'SELECT /*!40001 SQL_NO_CACHE */%'"
 
-thresholds *my_threshold = NULL;
+static thresholds *my_threshold = NULL;
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
+static int process_arguments (int, char **);
+static int validate_arguments (void);
+static void print_help (void);
 void print_usage (void);
 
 int
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 413aad6b..dec0b668 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -59,26 +59,25 @@ enum {
         PORT = 1248
 };
 
-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;
-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);
-int process_arguments(int, char **);
-void preparelist(char *string);
-bool strtoularray(unsigned long *array, char *string, const char *delim);
-void print_help(void);
+static char *server_address = NULL;
+static int server_port = PORT;
+static char *value_list = NULL;
+static char *req_password = NULL;
+static unsigned long lvalue_list[MAX_VALUE_LIST];
+static unsigned long warning_value = 0L;
+static unsigned long critical_value = 0L;
+static bool check_warning_value = false;
+static bool check_critical_value = false;
+static enum checkvars vars_to_check = CHECK_NONE;
+static bool show_all = false;
+
+static char recv_buffer[MAX_INPUT_BUFFER];
+
+static void fetch_data(const char *address, int port, const char *sendb);
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void preparelist(char *string);
+static bool strtoularray(unsigned long *array, char *string, const char *delim);
+static void print_help(void);
 void print_usage(void);
 
 int main(int argc, char **argv) {
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 55a49460..d33f8786 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -47,10 +47,10 @@ static bool do_jitter = false;
 static char *jwarn="5000";
 static char *jcrit="10000";
 
-int process_arguments (int, char **);
-thresholds *offset_thresholds = NULL;
-thresholds *jitter_thresholds = NULL;
-void print_help (void);
+static int process_arguments (int /*argc*/, char ** /*argv*/);
+static thresholds *offset_thresholds = NULL;
+static thresholds *jitter_thresholds = NULL;
+static void print_help (void);
 void print_usage (void);
 
 /* number of times to perform each request to get a good average. */
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 3af63603..176dfbc8 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -89,30 +89,30 @@ 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;
-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 process_arguments(int, char **);
-void print_help(void);
+static char *server_address = NULL;
+static char *volume_name = NULL;
+static char *nlm_name = NULL;
+static char *nrmp_name = NULL;
+static char *nrmm_name = NULL;
+static char *nrms_name = NULL;
+static char *nss1_name = NULL;
+static char *nss2_name = NULL;
+static char *nss3_name = NULL;
+static char *nss4_name = NULL;
+static char *nss5_name = NULL;
+static char *nss6_name = NULL;
+static char *nss7_name = NULL;
+static int server_port = PORT;
+static unsigned long warning_value = 0L;
+static unsigned long critical_value = 0L;
+static bool check_warning_value = false;
+static bool check_critical_value = false;
+static bool check_netware_version = false;
+static enum checkvar vars_to_check = NONE;
+static int sap_number = -1;
+
+static int process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
 void print_usage(void);
 
 int main(int argc, char **argv) {
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index e80d4775..599540b7 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -52,23 +52,22 @@ enum {
         PORT = 2000
 };
 
-char *server_address = NULL;
-int server_port = PORT;
-double warning_value = 0L;
-double critical_value = 0L;
-bool check_warning_value = false;
-bool check_critical_value = false;
-enum checkvar vars_to_check = NONE;
-int cmd_timeout = 1;
-
-int netstat_port = 0;
-char *disk_name = NULL;
-char *process_name = NULL;
-char send_buffer[MAX_INPUT_BUFFER];
-
-int process_arguments(int, char **);
+static char *server_address = NULL;
+static int server_port = PORT;
+static double warning_value = 0L;
+static double critical_value = 0L;
+static bool check_warning_value = false;
+static bool check_critical_value = false;
+static enum checkvar vars_to_check = NONE;
+
+static int netstat_port = 0;
+static char *disk_name = NULL;
+static char *process_name = NULL;
+static char send_buffer[MAX_INPUT_BUFFER];
+ 
+static int process_arguments(int, char **);
 void print_usage(void);
-void print_help(void);
+static void print_help(void);
 
 int main(int argc, char **argv) {
         int result = STATE_UNKNOWN;
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 5777ba07..1d78ccee 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -51,17 +51,17 @@ const char *email = "devel@monitoring-plugins.org";
 #include <sys/stat.h>
 #endif
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-int convert_to_seconds (char *);
-void print_help (void);
+static int process_arguments (int /*argc*/, char ** /*argv*/);
+static int validate_arguments (void);
+static int convert_to_seconds (char * /*etime*/);
+static void print_help (void);
 void print_usage (void);
 
-char *warning_range = NULL;
-char *critical_range = NULL;
-thresholds *procs_thresholds = NULL;
+static char *warning_range = NULL;
+static char *critical_range = NULL;
+static thresholds *procs_thresholds = NULL;
 
-int options = 0; /* bitmask of filter criteria to test against */
+static int options = 0; /* bitmask of filter criteria to test against */
 #define ALL 1
 #define STAT 2
 #define PPID 4
@@ -89,27 +89,25 @@ enum metric {
 };
 enum metric metric = METRIC_PROCS;
 
-int verbose = 0;
-int uid;
-pid_t ppid;
-int vsz;
-int rss;
-float pcpu;
-char *statopts;
-char *prog;
-char *exclude_progs;
-char **exclude_progs_arr = NULL;
-char exclude_progs_counter = 0;
-char *args;
-char *input_filename = NULL;
-regex_t re_args;
-char *fmt;
-char *fails;
-char tmp[MAX_INPUT_BUFFER];
-int kthread_filter = 0;
-int usepid = 0; /* whether to test for pid or /proc/pid/exe */
-
-FILE *ps_input = NULL;
+static int verbose = 0;
+static int uid;
+static pid_t ppid;
+static int vsz;
+static int rss;
+static float pcpu;
+static char *statopts;
+static char *prog;
+static char *exclude_progs;
+static char **exclude_progs_arr = NULL;
+static char exclude_progs_counter = 0;
+static char *args;
+static char *input_filename = NULL;
+static regex_t re_args;
+static char *fmt;
+static char *fails;
+static char tmp[MAX_INPUT_BUFFER];
+static int kthread_filter = 0;
+static int usepid = 0; /* whether to test for pid or /proc/pid/exe */
 
 static int
 stat_exe (const pid_t pid, struct stat *buf) {
@@ -834,7 +832,7 @@ be the total number of running processes\n\n"));
   printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
   printf ("  %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
   printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
-  printf ("  %s\n", _("Alert if CPU of any processes over 10\% or 20\%"));
+  printf ("  %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
 
   printf (UT_SUPPORT);
 }
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 8ed19e55..d9ff8fa7 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -46,8 +46,8 @@ const char *email = "devel@monitoring-plugins.org";
 #include <radiusclient.h>
 #endif
 
-int process_arguments (int, char **);
-void print_help (void);
+static int process_arguments (int /*argc*/, char ** /*argv*/);
+static void print_help (void);
 void print_usage (void);
 
 #if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) || defined(HAVE_LIBRADCLI)
@@ -78,22 +78,22 @@ void print_usage (void);
 #define REJECT_RC BADRESP_RC
 #endif
 
-int my_rc_read_config(char *);
+static int my_rc_read_config(char * /*a*/);
 
 #if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) || defined(HAVE_LIBRADCLI)
-rc_handle *rch = NULL;
+static rc_handle *rch = NULL;
 #endif
 
-char *server = NULL;
-char *username = NULL;
-char *password = NULL;
-char *nasid = NULL;
-char *nasipaddress = NULL;
-char *expect = NULL;
-char *config_file = NULL;
-unsigned short port = PW_AUTH_UDP_PORT;
-int retries = 1;
-bool verbose = false;
+static char *server = NULL;
+static char *username = NULL;
+static char *password = NULL;
+static char *nasid = NULL;
+static char *nasipaddress = NULL;
+static char *expect = NULL;
+static char *config_file = NULL;
+static unsigned short port = PW_AUTH_UDP_PORT;
+static int retries = 1;
+static bool verbose = false;
 
 /******************************************************************************
 
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index bc175287..e6369e63 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -40,8 +40,8 @@ const char *email = "devel@monitoring-plugins.org";
 #include <ctype.h>
 
 #ifdef HAVE_SSL
-bool check_cert = false;
-int days_till_exp_warn, days_till_exp_crit;
+static bool check_cert = false;
+static int days_till_exp_warn, days_till_exp_crit;
 #  define my_recv(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
 #  define my_send(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
 #else /* ifndef HAVE_SSL */
@@ -64,61 +64,59 @@ enum {
 
 #define EHLO_SUPPORTS_STARTTLS 1
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
+static int process_arguments (int, char **);
+static int validate_arguments (void);
+static void print_help (void);
 void print_usage (void);
-void smtp_quit(void);
-int recvline(char *, size_t);
-int recvlines(char *, size_t);
-int my_close(void);
+static void smtp_quit(void);
+static int recvline(char *, size_t);
+static int recvlines(char *, size_t);
+static int my_close(void);
 
 #include "regex.h"
-char regex_expect[MAX_INPUT_BUFFER] = "";
-regex_t preg;
-regmatch_t pmatch[10];
-char timestamp[20] = "";
-char errbuf[MAX_INPUT_BUFFER];
-int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-int eflags = 0;
-int errcode, excode;
-
-int server_port = SMTP_PORT;
-int server_port_option = 0;
-char *server_address = NULL;
-char *server_expect = NULL;
-char *mail_command = NULL;
-char *from_arg = NULL;
-int send_mail_from=0;
-int ncommands=0;
-int command_size=0;
-int nresponses=0;
-int response_size=0;
-char **commands = NULL;
-char **responses = NULL;
-char *authtype = NULL;
-char *authuser = NULL;
-char *authpass = NULL;
-double warning_time = 0;
-bool check_warning_time = false;
-double critical_time = 0;
-bool check_critical_time = false;
-int verbose = 0;
-bool use_ssl = false;
-bool use_starttls = false;
-bool use_sni = false;
-bool use_proxy_prefix = false;
-bool use_ehlo = false;
-bool use_lhlo = false;
-bool ssl_established = false;
-char *localhostname = NULL;
-int sd;
-char buffer[MAX_INPUT_BUFFER];
+static regex_t preg;
+static regmatch_t pmatch[10];
+static char errbuf[MAX_INPUT_BUFFER];
+static int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+static int eflags = 0;
+static int errcode, excode;
+
+static int server_port = SMTP_PORT;
+static int server_port_option = 0;
+static char *server_address = NULL;
+static char *server_expect = NULL;
+static char *mail_command = NULL;
+static char *from_arg = NULL;
+static int send_mail_from=0;
+static int ncommands=0;
+static int command_size=0;
+static int nresponses=0;
+static int response_size=0;
+static char **commands = NULL;
+static char **responses = NULL;
+static char *authtype = NULL;
+static char *authuser = NULL;
+static char *authpass = NULL;
+static double warning_time = 0;
+static bool check_warning_time = false;
+static double critical_time = 0;
+static bool check_critical_time = false;
+static int verbose = 0;
+static bool use_ssl = false;
+static bool use_starttls = false;
+static bool use_sni = false;
+static bool use_proxy_prefix = false;
+static bool use_ehlo = false;
+static bool use_lhlo = false;
+static bool ssl_established = false;
+static char *localhostname = NULL;
+static int sd;
+static char buffer[MAX_INPUT_BUFFER];
 enum {
   TCP_PROTOCOL = 1,
   UDP_PROTOCOL = 2,
 };
-bool ignore_send_quit_failure = false;
+static bool ignore_send_quit_failure = false;
 
 
 int
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index adb7ab81..526a29df 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -97,12 +97,12 @@ ups_config ups_config_init(void) {
 }
 
 // Forward declarations
-int determine_status(ups_config *, int *supported_options);
-int get_ups_variable(const char *, char *, const ups_config config);
+static int determine_status(ups_config * /*config*/, int *supported_options);
+static int get_ups_variable(const char * /*varname*/, char * /*buf*/, ups_config config);
 
-int process_arguments(int, char **, ups_config *);
-int validate_arguments(ups_config);
-void print_help(void);
+static int process_arguments(int /*argc*/, char ** /*argv*/, ups_config * /*config*/);
+static int validate_arguments(ups_config /*config*/);
+static void print_help(void);
 void print_usage(void);
 
 int main(int argc, char **argv) {