[asterisk-commits] wdoekes: branch 10 r350886 - in /branches/10: ./ utils/extconf.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Sun Jan 15 13:49:35 2012
New Revision: 350886

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350886
Log:
Fix shutdown handling of sqlite3 astdb.

If a db_sync was scheduled just before shutdown, the atexit code calling
db_sync would have no effect, causing the astdb commit thread to stay
alive. This caused the SIP/realtime_sipregs test to fail. (The fallback
kill would run the atexit code again and that would wreak havoc.) This
fixes that the atexit kill condition is picked up properly.

(closes issue ASTERISK-18883)
Reviewed by: Terry Wilson

Review: https://reviewboard.asterisk.org/r/1659

Modified:
    branches/10/   (props changed)
    branches/10/utils/extconf.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/utils/extconf.c?view=diff&rev=350886&r1=350885&r2=350886
==============================================================================
--- branches/10/utils/extconf.c (original)
+++ branches/10/utils/extconf.c Sun Jan 15 13:49:35 2012
@@ -3598,7 +3598,6 @@
 			if (c) {
 				char *cur2;
 				char real_inclusion_name[256];
-				struct ast_config_include *inclu;
                 
 				/* Strip off leading and trailing "'s and <>'s */
 				while((*c == '<') || (*c == '>') || (*c == '\"')) c++;
@@ -3625,7 +3624,7 @@
 				/* ast_log(LOG_WARNING, "Reading in included file %s withcomments=%d\n", cur, withcomments); */
 				
 				/* record this inclusion */
-				inclu = ast_include_new(cfg, configfile, cur, do_exec, cur2, lineno, real_inclusion_name, sizeof(real_inclusion_name));
+				ast_include_new(cfg, configfile, cur, do_exec, cur2, lineno, real_inclusion_name, sizeof(real_inclusion_name));
 				
 				do_include = ast_config_internal_load(cur, cfg, withcomments, real_inclusion_name) ? 1 : 0;
 				if(!ast_strlen_zero(exec_file))
@@ -4437,7 +4436,7 @@
 
 int ast_build_timing(struct ast_timing *i, const char *info_in)
 {
-	char *info_save, *info;
+	char *info;
 	int j, num_fields, last_sep = -1;
 
 	/* Check for empty just in case */
@@ -4446,7 +4445,7 @@
 	}
 
 	/* make a copy just in case we were passed a static string */
-	info_save = info = ast_strdupa(info_in);
+	info = ast_strdupa(info_in);
 
 	/* count the number of fields in the timespec */
 	for (j = 0, num_fields = 1; info[j] != '\0'; j++) {