Start moving in changes from my resolve-shadow-warnings branch. Going to do

this in pieces so the diffs are a little bit smaller and more reviewable.

pbx/ and formats/ first.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136298 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 24 insertions, 24 deletions

diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c
index 50c45e08d..15dae84d6 100644
--- a/pbx/dundi-parser.c
+++ b/pbx/dundi-parser.c
@@ -339,7 +339,7 @@ static struct dundi_ie {
 	int ie;
 	char *name;
 	void (*dump)(char *output, int maxlen, void *value, int len);
-} ies[] = {
+} infoelts[] = {
 	{ DUNDI_IE_EID, "ENTITY IDENT", dump_eid },
 	{ DUNDI_IE_CALLED_CONTEXT, "CALLED CONTEXT", dump_string },
 	{ DUNDI_IE_CALLED_NUMBER, "CALLED NUMBER", dump_string },
@@ -370,9 +370,9 @@ static struct dundi_ie {
 const char *dundi_ie2str(int ie)
 {
 	int x;
-	for (x=0;x<(int)sizeof(ies) / (int)sizeof(ies[0]); x++) {
-		if (ies[x].ie == ie)
-			return ies[x].name;
+	for (x = 0; x < ARRAY_LEN(infoelts); x++) {
+		if (infoelts[x].ie == ie)
+			return infoelts[x].name;
 	}
 	return "Unknown IE";
 }
@@ -399,18 +399,18 @@ static void dump_ies(unsigned char *iedata, int spaces, int len)
 			return;
 		}
 		found = 0;
-		for (x=0;x<(int)sizeof(ies) / (int)sizeof(ies[0]); x++) {
-			if (ies[x].ie == ie) {
-				if (ies[x].dump) {
-					ies[x].dump(interp, (int)sizeof(interp), iedata + 2, ielen);
-					snprintf(tmp, (int)sizeof(tmp), "   %s%-15.15s : %s\n", (spaces ? "     " : "" ), ies[x].name, interp);
+		for (x = 0; x < ARRAY_LEN(infoelts); x++) {
+			if (infoelts[x].ie == ie) {
+				if (infoelts[x].dump) {
+					infoelts[x].dump(interp, (int)sizeof(interp), iedata + 2, ielen);
+					snprintf(tmp, (int)sizeof(tmp), "   %s%-15.15s : %s\n", (spaces ? "     " : "" ), infoelts[x].name, interp);
 					outputf(tmp);
 				} else {
 					if (ielen)
 						snprintf(interp, (int)sizeof(interp), "%d bytes", ielen);
 					else
 						strcpy(interp, "Present");
-					snprintf(tmp, (int)sizeof(tmp), "   %s%-15.15s : %s\n", (spaces ? "     " : "" ), ies[x].name, interp);
+					snprintf(tmp, (int)sizeof(tmp), "   %s%-15.15s : %s\n", (spaces ? "     " : "" ), infoelts[x].name, interp);
 					outputf(tmp);
 				}
 				found++;
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index bc27ccc1a..2d93fd8fe 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -654,7 +654,6 @@ static char *complete_dialplan_add_include(struct ast_cli_args *a)
 	} else if (a->pos == 4) { /* dialplan add include CTX _X_ */
 		/* complete  as 'into' if context exists or we are unable to check */
 		char *context, *dupline;
-		struct ast_context *c;
 		const char *s = skip_words(a->line, 3); /* should not fail */
 
 		if (a->n != 0)	/* only once */
@@ -674,8 +673,9 @@ static char *complete_dialplan_add_include(struct ast_cli_args *a)
 			/* our fault, we can't check, so complete 'into' ... */
 			ret = strdup("into");
 		} else {
-			for (c = NULL; !ret && (c = ast_walk_contexts(c)); )
-				if (!strcmp(context, ast_get_context_name(c)))
+			struct ast_context *ctx;
+			for (ctx = NULL; !ret && (ctx = ast_walk_contexts(ctx)); )
+				if (!strcmp(context, ast_get_context_name(ctx)))
 					ret = strdup("into"); /* found */
 			ast_unlock_contexts();
 		}
@@ -845,7 +845,7 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
 	/* walk all contexts */
 	for (c = NULL; (c = ast_walk_contexts(c)); ) {
 		int context_header_written = 0;
-		struct ast_exten *e, *last_written_e = NULL;
+		struct ast_exten *ext, *last_written_e = NULL;
 		struct ast_include *i;
 		struct ast_ignorepat *ip;
 		struct ast_sw *sw;
@@ -863,11 +863,11 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
 		}
 
 		/* walk extensions ... */
-		for (e = NULL; (e = ast_walk_context_extensions(c, e)); ) {
+		for (ext = NULL; (ext = ast_walk_context_extensions(c, ext)); ) {
 			struct ast_exten *p = NULL;
 
 			/* fireout priorities */
-			while ( (p = ast_walk_extension_priorities(e, p)) ) {
+			while ( (p = ast_walk_extension_priorities(ext, p)) ) {
 				if (strcmp(ast_get_extension_registrar(p), registrar) != 0) /* not this source */
 					continue;
 		
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 25206f156..5d3a0be12 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -1139,7 +1139,7 @@ static int cache_lookup_internal(time_t now, struct dundi_request *req, char *ke
 	return 0;
 }
 
-static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned long crc32, int *lowexpiration)
+static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned long checksum, int *lowexpiration)
 {
 	char key[256];
 	char eid_str[20];
@@ -1155,7 +1155,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned
 	dundi_eid_to_str_short(eid_str, sizeof(eid_str), peer_eid);
 	dundi_eid_to_str_short(eidroot_str, sizeof(eidroot_str), &req->root_eid);
 	ast_eid_to_str(eid_str_full, sizeof(eid_str_full), peer_eid);
-	snprintf(key, sizeof(key), "%s/%s/%s/e%08lx", eid_str, req->number, req->dcontext, crc32);
+	snprintf(key, sizeof(key), "%s/%s/%s/e%08lx", eid_str, req->number, req->dcontext, checksum);
 	res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
 	snprintf(key, sizeof(key), "%s/%s/%s/e%08lx", eid_str, req->number, req->dcontext, 0L);
 	res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
@@ -1170,7 +1170,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, unsigned
 				break;
 			x++;
 			/* Check for hints */
-			snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08lx", eid_str, tmp, req->dcontext, crc32);
+			snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08lx", eid_str, tmp, req->dcontext, checksum);
 			res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
 			snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08lx", eid_str, tmp, req->dcontext, 0L);
 			res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
@@ -4640,11 +4640,11 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
 			} else if(sin->sin_port != last_port)
 				ast_log(LOG_WARNING, "change to port ignored until next asterisk re-start\n");
 		} else if (!strcasecmp(v->name, "bindaddr")) {
-			struct hostent *hp;
-			struct ast_hostent he;
-			hp = ast_gethostbyname(v->value, &he);
-			if (hp) {
-				memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
+			struct hostent *hep;
+			struct ast_hostent hent;
+			hep = ast_gethostbyname(v->value, &hent);
+			if (hep) {
+				memcpy(&sin->sin_addr, hep->h_addr, sizeof(sin->sin_addr));
 			} else
 				ast_log(LOG_WARNING, "Invalid host/IP '%s'\n", v->value);
 		} else if (!strcasecmp(v->name, "authdebug")) {