diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
| commit | 37aa52fd78996b5c516ff4c851b60252eda84b05 (patch) | |
| tree | e1651180838e594a0203f863f3cdd084860e1bf5 /main/pbx.c | |
| parent | 810b9c887949fc4bd9f01dcdc0d3a4f476cb00de (diff) | |
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/pbx.c b/main/pbx.c index 366139675..321b29a01 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6692,7 +6692,6 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m) const char *exten, *context; const char *id = astman_get_header(m, "ActionID"); char idtext[256]; - int res; /* Variables used for different counters */ struct dialplan_counters counters; @@ -6707,7 +6706,7 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m) exten = astman_get_header(m, "Extension"); context = astman_get_header(m, "Context"); - res = manager_show_dialplan_helper(s, m, idtext, context, exten, &counters, NULL); + manager_show_dialplan_helper(s, m, idtext, context, exten, &counters, NULL); if (context && !counters.context_existence) { char errorbuf[BUFSIZ]; @@ -7540,7 +7539,7 @@ static const char * const months[] = 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 */ @@ -7549,7 +7548,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++) { |