23 files changed, 31 insertions, 24 deletions

diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 1cbdcd60..92c3827a 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -175,7 +175,7 @@ check_cluster_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "hHsvVw:c:d:l:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index fe7e61d6..67d89129 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -980,7 +980,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index = getopt_long(
                         argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:x:b:d:e:p:s:R:r:u:f:C:J:K:DnlLS::m:M:NEB",
                         longopts, &option);
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 9ea19e6a..9ec8028a 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -284,7 +284,7 @@ check_dig_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:E:X:46", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 73fe815e..e773e56c 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -448,7 +448,7 @@ check_disk_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index = getopt_long(
                         argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 6160c2cb..86ef64a4 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -361,7 +361,7 @@ check_fping_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:M:R:46", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 974a7253..48ec6883 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -186,7 +186,7 @@ check_game_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 9907abc5..883f1df0 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -299,7 +299,7 @@ check_hpjd_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "+hVH:C:p:D", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index c1325cf9..43731039 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -169,7 +169,7 @@ static check_ide_smart_config_wrapper process_arguments(int argc, char **argv) {
                 int longindex = 0;
                 int option_index = getopt_long(argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 7f8282b4..0e8c5804 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -362,7 +362,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:W:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 644cd604..60fa646f 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -295,7 +295,7 @@ static check_load_config_wrapper process_arguments(int argc, char **argv) {
                 int option = 0;
                 int option_index = getopt_long(argc, argv, "Vhrc:w:n:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 15005bf5..b70e0e22 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -504,7 +504,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index a46dc1ed..e2f230c9 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -227,7 +227,7 @@ check_nagios_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "+hVvF:C:e:t:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index e1ee0f5c..0c9cb19d 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -221,7 +221,7 @@ check_ping_config_wrapper process_arguments(int argc, char **argv) {
         while (true) {
                 int option_index = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 50837cb4..174dcd97 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -432,7 +432,7 @@ check_procs_config_wrapper process_arguments(int argc, char **argv) {
                 int option_index =
                         getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:TX:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF) {
+                if (CHECK_EOF(option_index)) {
                         break;
                 }
 
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index f20af660..03153926 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -334,7 +334,7 @@ check_radius_config_wrapper process_arguments(int argc, char **argv) {
                 int option = 0;
                 int option_index = getopt_long(argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_real.d/config.h b/plugins/check_real.d/config.h
index 2d99ad49..15b70b98 100644
--- a/plugins/check_real.d/config.h
+++ b/plugins/check_real.d/config.h
@@ -17,7 +17,7 @@ typedef struct {
         int server_port;
         char *server_url;
 
-        char *server_expect;
+        const char *server_expect;
 
         mp_thresholds time_thresholds;
 
diff --git a/plugins/check_smtp.d/config.h b/plugins/check_smtp.d/config.h
index b0d42ed1..47826362 100644
--- a/plugins/check_smtp.d/config.h
+++ b/plugins/check_smtp.d/config.h
@@ -40,8 +40,8 @@ typedef struct {
 
         bool use_proxy_prefix;
 #ifdef HAVE_SSL
-        int days_till_exp_warn;
-        int days_till_exp_crit;
+        unsigned int days_till_exp_warn;
+        unsigned int days_till_exp_crit;
         bool use_ssl;
         bool use_starttls;
         bool use_sni;
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 1746fd79..0f62ce8b 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -447,7 +447,7 @@ static process_arguments_wrapper process_arguments(int argc, char **argv) {
                         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 (option_char == -1 || option_char == EOF) {
+                if (CHECK_EOF(option_char)) {
                         break;
                 }
 
@@ -517,7 +517,7 @@ static process_arguments_wrapper process_arguments(int argc, char **argv) {
                         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 (option_char == -1 || option_char == EOF) {
+                if (CHECK_EOF(option_char)) {
                         break;
                 }
 
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index cd8e04b0..924322e4 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -562,7 +562,7 @@ static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_t
                 int option_index =
                         getopt_long(argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 99708ad3..aec995d4 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -213,7 +213,7 @@ check_time_config_wrapper process_arguments(int argc, char **argv) {
                 int option = 0;
                 option_char = getopt_long(argc, argv, "hVH:w:c:W:C:p:t:u", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF) {
+                if (CHECK_EOF(option_char)) {
                         break;
                 }
 
diff --git a/plugins/common.h b/plugins/common.h
index b3053486..9d1434a3 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -205,4 +205,11 @@ enum {
 #       define __attribute__(x) /* do nothing */
 #endif
 
+/* for checking the result of getopt_long */
+#if EOF == -1
+#define CHECK_EOF(c) ((c) == EOF)
+#else
+#define CHECK_EOF(c) ((c) == -1 || (c) == EOF)
+#endif
+
 #endif /* _COMMON_H_ */
diff --git a/plugins/netutils.h b/plugins/netutils.h
index f3d046c3..16c2d31f 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -128,7 +128,7 @@ typedef struct {
         double remaining_seconds;
         retrieve_expiration_date_errors errors;
 } net_ssl_check_cert_result;
-net_ssl_check_cert_result np_net_ssl_check_cert2(int days_till_exp_warn, int days_till_exp_crit);
+net_ssl_check_cert_result np_net_ssl_check_cert2(unsigned int days_till_exp_warn, unsigned int days_till_exp_crit);
 
 mp_state_enum np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
 mp_subcheck mp_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index c4ab6a05..bcfb08d6 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -410,7 +410,7 @@ retrieve_expiration_time_result np_net_ssl_get_cert_expiration(X509 *certificate
 #       endif /* MOPL_USE_OPENSSL */
 }
 
-net_ssl_check_cert_result np_net_ssl_check_cert2(int days_till_exp_warn, int days_till_exp_crit) {
+net_ssl_check_cert_result np_net_ssl_check_cert2(unsigned int days_till_exp_warn, unsigned int days_till_exp_crit) {
 #       ifdef MOPL_USE_OPENSSL
         X509 *certificate = NULL;
         certificate = SSL_get_peer_certificate(s);