[asterisk-commits] wdoekes: trunk r350887 - in /trunk: ./ utils/extconf.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Sun Jan 15 13:57:54 2012
New Revision: 350887

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350887
Log:
Fix -Werror=unused-but-set-variable compile error in utils/extconf.c.

Note that I'm not confirming legitimacy of having that file in tree at
all. Is anyone using aelparse/conf2ael?

(issue ASTERISK-15350)
........

Merged revisions 350885 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350886 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/utils/extconf.c

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

Modified: trunk/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/extconf.c?view=diff&rev=350887&r1=350886&r2=350887
==============================================================================
--- trunk/utils/extconf.c (original)
+++ trunk/utils/extconf.c Sun Jan 15 13:57:54 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++) {