kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep up with shadow warnings. One day I'll actually enable this in the Makefile.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-10-08 12:15:06 +00:00
parent 24c127ac19
commit ceee55ea63
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_meetme.c
View File

@@ -2157,9 +2157,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
for ( ; var; var = var->next) { for ( ; var; var = var->next) {
if (!strcasecmp(var->name, "endtime")) { if (!strcasecmp(var->name, "endtime")) {
struct ast_tm tm; struct ast_tm endtime_tm;
ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &tm); ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &endtime_tm);
tmp = ast_mktime(&tm, NULL); tmp = ast_mktime(&endtime_tm, NULL);
localendtime = tmp.tv_sec; 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")) { } else if (!strcasecmp(var->name, "adminopts")) {
ast_copy_string(adminopts, var->value, sizeof(char[OPTIONS_LEN])); ast_copy_string(adminopts, var->value, sizeof(char[OPTIONS_LEN]));
} else if (!strcasecmp(var->name, "endtime")) { } else if (!strcasecmp(var->name, "endtime")) {
struct ast_tm tm; struct ast_tm endtime_tm;
ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &tm); ast_strptime(var->value, "%Y-%m-%d %H:%M:%S", &endtime_tm);
endtime = ast_mktime(&tm, NULL); endtime = ast_mktime(&endtime_tm, NULL);
} }
} }

4
cdr/cdr_adaptive_odbc.c
View File

@@ -373,9 +373,9 @@ static int odbc_log(struct ast_cdr *cdr)
/* Check if we have a similarly named variable */ /* Check if we have a similarly named variable */
if (datefield && tableptr->usegmtime) { 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, }; 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); ast_strftime(colbuf, sizeof(colbuf), "%Y-%m-%d %H:%M:%S", &tm);
} else { } else {
ast_cdr_getvar(cdr, entry->cdrname, &colptr, colbuf, sizeof(colbuf), 0, datefield ? 0 : 1); ast_cdr_getvar(cdr, entry->cdrname, &colptr, colbuf, sizeof(colbuf), 0, datefield ? 0 : 1);

6
funcs/func_curl.c
View File

@@ -73,12 +73,12 @@ AST_LIST_HEAD_STATIC(global_curl_info, curl_settings);
static void curlds_free(void *data) static void curlds_free(void *data)
{ {
AST_LIST_HEAD(global_curl_info, curl_settings) *list = data; AST_LIST_HEAD(global_curl_info, curl_settings) *list = data;
struct curl_settings *cur; struct curl_settings *setting;
if (!list) { if (!list) {
return; return;
} }
while ((cur = AST_LIST_REMOVE_HEAD(list, list))) { while ((setting = AST_LIST_REMOVE_HEAD(list, list))) {
free(cur); free(setting);
} }
AST_LIST_HEAD_DESTROY(list); AST_LIST_HEAD_DESTROY(list);
} }

4
res/res_odbc.c
View File

@@ -758,7 +758,7 @@ static odbc_status odbc_obj_disconnect(struct odbc_obj *obj)
int res; int res;
SQLINTEGER err; SQLINTEGER err;
short int mlen; short int mlen;
unsigned char msg[200], stat[10]; unsigned char msg[200], state[10];
/* Nothing to disconnect */ /* Nothing to disconnect */
if (!obj->con) { if (!obj->con) {
@@ -779,7 +779,7 @@ static odbc_status odbc_obj_disconnect(struct odbc_obj *obj)
obj->con = NULL; obj->con = NULL;
ast_log(LOG_DEBUG, "Database handle deallocated\n"); ast_log(LOG_DEBUG, "Database handle deallocated\n");
} else { } 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); ast_log(LOG_WARNING, "Unable to deallocate database handle? %d errno=%d %s\n", res, (int)err, msg);
} }