3 files changed, 7 insertions, 11 deletions

diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 8b8e5708..34fb3909 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -118,10 +118,6 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
 
         int i = 0;
 
-        /* if no command was passed, return with no error */
-        if (argv == NULL)
-                return -1;
-
         if (!_cmd_pids)
                 CMD_INIT;
 
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 2acada22..56a586ad 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -159,6 +159,7 @@ int perf_labels = 1;
 char* ip_version = "";
 double multiplier = 1.0;
 char *fmtstr = "";
+bool fmtstr_set = false;
 char buffer[DEFAULT_BUFFER_SIZE];
 bool ignore_mib_parsing_errors = false;
 
@@ -437,7 +438,8 @@ main (int argc, char **argv)
                 }
                 else if (strstr (response, "INTEGER: ")) {
                         show = multiply (strstr (response, "INTEGER: ") + 9);
-                        if (fmtstr != "") {
+
+                        if (fmtstr_set) {
                                 conv = fmtstr;
                         }
                 }
@@ -611,8 +613,9 @@ main (int argc, char **argv)
                         len = sizeof(perfstr)-strlen(perfstr)-1;
                         strncat(perfstr, show, len>ptr-show ? ptr-show : len);
 
-                        if (type)
+                        if (strcmp(type, "") != 0) {
                                 strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
+                        }
 
                         if (warning_thresholds) {
                                 strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
@@ -988,6 +991,7 @@ process_arguments (int argc, char **argv)
                 case 'f':
                         if (multiplier != 1.0) {
                                 fmtstr=optarg;
+                                fmtstr_set = true;
                         }
                         break;
                 case L_IGNORE_MIB_PARSING_ERRORS:
@@ -1204,7 +1208,7 @@ multiply (char *str)
         if(verbose>2)
                 printf("    multiply extracted double: %f\n", val);
         val *= multiplier;
-        if (fmtstr != "") {
+        if (fmtstr_set) {
                 conv = fmtstr;
         }
         if (val == (int)val) {
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index c1d675d0..102191e4 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -116,10 +116,6 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         env[0] = strdup("LC_ALL=C");
         env[1] = '\0';
 
-        /* if no command was passed, return with no error */
-        if (cmdstring == NULL)
-                return -1;
-
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
         cmdlen = strlen(cmdstring);