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

Fix -Werror=unused-but-set-variable compile error in utils/extconf.c.

Browse Source 
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
This commit is contained in:
Walter Doekes
2012-01-15 19:57:54 +00:00
parent 35a5b042d7
commit b84c0aabd4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/extconf.c
View 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++) {