]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Silence warning from clang-3.5 dealing with redefining the variable argv which is...
authorWilliam King <william.king@quentustech.com>
Sun, 3 Aug 2014 02:47:07 +0000 (19:47 -0700)
committerWilliam King <william.king@quentustech.com>
Sun, 3 Aug 2014 02:47:07 +0000 (19:47 -0700)
src/switch_console.c

index 828613edbcece69685be5dfbd09813a9a0b2f30b..6100bb22df3a1d4f11c131bf6b2385c33c5d7555 100644 (file)
@@ -495,15 +495,15 @@ static int comp_callback(void *pArg, int argc, char **argv, char **columnNames)
                char *p = target + 3, *list = NULL;
 
                if (p) {
-                       char *argv[100] = { 0 };
+                       char *s_argv[100] = { 0 };
                        char *r_argv[1] = { 0 }, *r_cols[1] = {0};
                        list = strdup(p);
                        
-                       argc = switch_separate_string(list, ':', argv, (sizeof(argv) / sizeof(argv[0])));
+                       argc = switch_separate_string(list, ':', s_argv, (sizeof(s_argv) / sizeof(s_argv[0])));
 
                        for (i = 0; (int)i < argc; i++) {
-                               if (!cur || !strncmp(argv[i], cur, strlen(cur))) {
-                                       r_argv[0] = argv[i];
+                               if (!cur || !strncmp(s_argv[i], cur, strlen(cur))) {
+                                       r_argv[0] = s_argv[i];
                                        comp_callback(h, 1, r_argv, r_cols);
                                }
                        }