diff options
| author | Sean Bright <sean@malleable.com> | 2012-03-08 17:02:52 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-03-08 17:02:52 +0000 |
| commit | 99bd5b1e2e70160b2d3f6dcbd122b06654c17788 (patch) | |
| tree | db17db12c4d7846442c746f0997325801cb96415 /pbx | |
| parent | a8116350bc47069650de7d08353d8c1c6d6bfe4b (diff) | |
Eliminate a bunch of shadow warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_config.c | 2 | ||||
| -rw-r--r-- | pbx/pbx_dundi.c | 6 | ||||
| -rw-r--r-- | pbx/pbx_lua.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4aeabe9c2..86b132279 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1632,8 +1632,8 @@ process_extension: v->value, cxt, v->lineno, vfile); } } else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) { - char *stringp = realvalue; char *appl, *data; + stringp = realvalue; if (!strcasecmp(v->name, "switch")) { pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1); diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index ab48ad6a3..2e5c39e17 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -1224,7 +1224,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, uint32_t crc32, int *lowexpiration) +static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, uint32_t crc, int *lowexpiration) { char key[256]; char eid_str[20]; @@ -1240,7 +1240,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, uint32_t 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%08x", eid_str, req->number, req->dcontext, crc32); + snprintf(key, sizeof(key), "%s/%s/%s/e%08x", eid_str, req->number, req->dcontext, crc); res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration); snprintf(key, sizeof(key), "%s/%s/%s/e%08x", eid_str, req->number, req->dcontext, 0); res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration); @@ -1255,7 +1255,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, uint32_t break; x++; /* Check for hints */ - snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08x", eid_str, tmp, req->dcontext, crc32); + snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08x", eid_str, tmp, req->dcontext, crc); res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration); snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08x", eid_str, tmp, req->dcontext, 0); res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration); diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index d0e0f984b..928861698 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -1257,7 +1257,7 @@ static lua_State *lua_get_state(struct ast_channel *chan) lua_State *L; if (!chan) { - lua_State *L = luaL_newstate(); + L = luaL_newstate(); if (!L) { ast_log(LOG_ERROR, "Error allocating lua_State, no memory\n"); return NULL; |