Fix -Werror=unused-but-set-variable compile error in utils/extconf.c.
authorWalter Doekes <walter+asterisk@wjd.nu>
Sun, 15 Jan 2012 19:57:54 +0000 (19:57 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Sun, 15 Jan 2012 19:57:54 +0000 (19:57 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

utils/extconf.c

index 54e11a0..20b2e5b 100644 (file)
@@ -3598,7 +3598,6 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                        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 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                                /* 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);
 
 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 @@ int ast_build_timing(struct ast_timing *i, const char *info_in)
        }
 
        /* 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++) {