Merge branch '2.1' into develop

2017-08-15 10:31:30 +03:00
parent 49ba1f8fa0 3485a32731
commit de7004cb95
12 changed files with 24 additions and 24 deletions
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@ -1760,7 +1760,7 @@ static struct
 static unsigned long
 convert_arg(char *arg, int arg_type)
 {
-    unsigned long rval;
+    unsigned long rval = 0;

    switch (arg_type)
    {