From: William King <william.king@quentustech.com>
Date: Sun, 3 Aug 2014 02:47:07 +0000 (-0700)
Subject: Silence warning from clang-3.5 dealing with redefining the variable argv which is... 
X-Git-Tag: v1.4.8~7^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f2f9f8ff2de9ae01765ffb190fb3fbb72f63b7c;p=thirdparty%2Ffreeswitch.git

Silence warning from clang-3.5 dealing with redefining the variable argv which is first defined as a function parameter
---

diff --git a/src/switch_console.c b/src/switch_console.c
index 828613edbc..6100bb22df 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -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);
 				}
 			}