[asterisk-commits] seanbright: trunk r147457 - in /trunk: apps/ cdr/ funcs/ res/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Oct  8 07:15:06 2008
New Revision: 147457

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147457
Log:
Keep up with shadow warnings.  One day I'll actually enable this in the Makefile.

Modified:
    trunk/apps/app_meetme.c
    trunk/cdr/cdr_adaptive_odbc.c
    trunk/funcs/func_curl.c
    trunk/res/res_odbc.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=147457&r1=147456&r2=147457
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Oct  8 07:15:06 2008
@@ -2157,9 +2157,9 @@
 
 						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 @@
 			} 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);
 			}
 		}
 

Modified: trunk/cdr/cdr_adaptive_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_adaptive_odbc.c?view=diff&rev=147457&r1=147456&r2=147457
==============================================================================
--- trunk/cdr/cdr_adaptive_odbc.c (original)
+++ trunk/cdr/cdr_adaptive_odbc.c Wed Oct  8 07:15:06 2008
@@ -373,9 +373,9 @@
 
 			/* 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);

Modified: trunk/funcs/func_curl.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_curl.c?view=diff&rev=147457&r1=147456&r2=147457
==============================================================================
--- trunk/funcs/func_curl.c (original)
+++ trunk/funcs/func_curl.c Wed Oct  8 07:15:06 2008
@@ -73,12 +73,12 @@
 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);
 }

Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_odbc.c?view=diff&rev=147457&r1=147456&r2=147457
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Wed Oct  8 07:15:06 2008
@@ -758,7 +758,7 @@
 	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 @@
 		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);
 	}