smatch: fix couple warnings

ui/mtr.c:616:21: warning: Using plain integer as NULL pointer
packet/cmdparse.c:80:18: warning: Variable length array is used.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/packet/cmdparse.c b/packet/cmdparse.c
index 6c1d16a7e60aa96309bee2c96ae451e01eb9159c..e01b03fd61e1d9d3186035ff4114ca6efde4d2ce 100644 (file)
--- a/packet/cmdparse.c
+++ b/packet/cmdparse.c
@@ -76,15 +76,14 @@ int parse_command(
     struct command_t *command,
     char *command_string)
 {
-    const int max_tokens = MAX_COMMAND_ARGUMENTS * 2 + 2;
-    char *tokens[max_tokens];
+    char *tokens[MAX_COMMAND_TOKENS];
     int token_count;
     int i;
 
     memset(command, 0, sizeof(struct command_t));
 
     /*  Tokenize the string using whitespace  */
-    token_count = tokenize_command(tokens, max_tokens, command_string);
+    token_count = tokenize_command(tokens, MAX_COMMAND_TOKENS, command_string);
     if (token_count < 2) {
         errno = EINVAL;
         return -1;

diff --git a/packet/cmdparse.h b/packet/cmdparse.h
index aae1fe306a9529393502f4d4e044be4dfc1d0a6c..9b9c3906e152378ce0472d21959796131314cb50 100644 (file)
--- a/packet/cmdparse.h
+++ b/packet/cmdparse.h
@@ -19,7 +19,10 @@
 #ifndef CMDPARSE_H
 #define CMDPARSE_H
 
-#define MAX_COMMAND_ARGUMENTS 16
+enum {
+    MAX_COMMAND_ARGUMENTS = 16,
+    MAX_COMMAND_TOKENS = MAX_COMMAND_ARGUMENTS * 2 + 2
+};
 
 /*  Parsed commands, or command replies, ready for semantic interpretation  */
 struct command_t

diff --git a/ui/mtr.c b/ui/mtr.c
index c635aec4e2b79b4f0c1fc3f667d87265ee8a1765..da1e32dc084f5b3173a0aaafce3384a64e650143 100644 (file)
--- a/ui/mtr.c
+++ b/ui/mtr.c
@@ -613,7 +613,7 @@ static void init_rand(void)
 {
   struct timeval tv;
 
-  gettimeofday(&tv, 0);
+  gettimeofday(&tv, NULL);
   srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
 }