From ceee55ea63fcc720346a2d1f4676e65ca7cc3b59 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Wed, 8 Oct 2008 12:15:06 +0000
Subject: [PATCH] Keep up with shadow warnings. One day I'll actually enable
this in the Makefile.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_meetme.c | 12 ++++++------
cdr/cdr_adaptive_odbc.c | 4 ++--
funcs/func_curl.c | 6 +++---
res/res_odbc.c | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 591799058b..68c8617570 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2157,9 +2157,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
for ( ; var; var = var->next) {
if (!strcasecmp(var->name, "endtime")) {
- struct ast_tm tm;
- ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &tm);
- tmp = ast_mktime(&tm, NULL);
+ struct ast_tm endtime_tm;
+ ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &endtime_tm);
+ tmp = ast_mktime(&endtime_tm, NULL);
localendtime = tmp.tv_sec;
}
}
@@ -3057,9 +3057,9 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
} else if (!strcasecmp(var->name, "adminopts")) {
ast_copy_string(adminopts, var->value, sizeof(char[OPTIONS_LEN]));
} else if (!strcasecmp(var->name, "endtime")) {
- struct ast_tm tm;
- ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &tm);
- endtime = ast_mktime(&tm, NULL);
+ struct ast_tm endtime_tm;
+ ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &endtime_tm);
+ endtime = ast_mktime(&endtime_tm, NULL);
}
}
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index 244a0380cc..edc01e7dd5 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -373,9 +373,9 @@ static int odbc_log(struct ast_cdr *cdr)
/* Check if we have a similarly named variable */
if (datefield && tableptr->usegmtime) {
- struct timeval tv = (datefield == 1) ? cdr->start : (datefield == 2) ? cdr->answer : cdr->end;
+ struct timeval date_tv = (datefield == 1) ? cdr->start : (datefield == 2) ? cdr->answer : cdr->end;
struct ast_tm tm = { 0, };
- ast_localtime(&tv, &tm, "UTC");
+ ast_localtime(&date_tv, &tm, "UTC");
ast_strftime(colbuf, sizeof(colbuf), "%Y-%m-%d %H:%M:%S", &tm);
} else {
ast_cdr_getvar(cdr, entry->cdrname, &colptr, colbuf, sizeof(colbuf), 0, datefield ? 0 : 1);
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index e385ed9e17..3a936e704d 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -73,12 +73,12 @@ AST_LIST_HEAD_STATIC(global_curl_info, curl_settings);
static void curlds_free(void *data)
{
AST_LIST_HEAD(global_curl_info, curl_settings) *list = data;
- struct curl_settings *cur;
+ struct curl_settings *setting;
if (!list) {
return;
}
- while ((cur = AST_LIST_REMOVE_HEAD(list, list))) {
- free(cur);
+ while ((setting = AST_LIST_REMOVE_HEAD(list, list))) {
+ free(setting);
}
AST_LIST_HEAD_DESTROY(list);
}
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 0d257fcc68..a16f79a4af 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -758,7 +758,7 @@ static odbc_status odbc_obj_disconnect(struct odbc_obj *obj)
int res;
SQLINTEGER err;
short int mlen;
- unsigned char msg[200], stat[10];
+ unsigned char msg[200], state[10];
/* Nothing to disconnect */
if (!obj->con) {
@@ -779,7 +779,7 @@ static odbc_status odbc_obj_disconnect(struct odbc_obj *obj)
obj->con = NULL;
ast_log(LOG_DEBUG, "Database handle deallocated\n");
} else {
- SQLGetDiagRec(SQL_HANDLE_DBC, obj->con, 1, stat, &err, msg, 100, &mlen);
+ SQLGetDiagRec(SQL_HANDLE_DBC, obj->con, 1, state, &err, msg, 100, &mlen);
ast_log(LOG_WARNING, "Unable to deallocate database handle? %d errno=%d %s\n", res, (int)err, msg);
}
--
GitLab