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 /pbx | |
| 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 'pbx')
| -rw-r--r-- | pbx/pbx_config.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index fc1f1cede..f65869e92 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -677,7 +677,7 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a int incomplete = 0; /* incomplete config write? */ FILE *output; struct ast_flags config_flags = { 0 }; - const char *base, *slash, *file; + const char *base, *slash; switch (cmd) { case CLI_INIT: @@ -716,16 +716,13 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a if (!strstr(a->argv[2], ".conf")) { /*no, this is assumed to be a pathname */ /* if filename ends with '/', do not add one */ slash = (*(a->argv[2] + strlen(a->argv[2]) -1) == '/') ? "/" : ""; - file = config; /* default: 'extensions.conf' */ } else { /* yes, complete file name */ slash = ""; - file = ""; } } else { /* no config file, default one */ base = ast_config_AST_CONFIG_DIR; slash = "/"; - file = config; } snprintf(filename, sizeof(filename), "%s%s%s", base, slash, config); @@ -1640,7 +1637,6 @@ static void pbx_load_users(void) char dahdicopy[256]; char *ext, altcopy[256]; char *c; - int len; int hasvoicemail; int start, finish, x; struct ast_context *con = NULL; @@ -1654,7 +1650,6 @@ static void pbx_load_users(void) if (!strcasecmp(cat, "general")) continue; iface[0] = '\0'; - len = sizeof(iface); if (ast_true(ast_config_option(cfg, cat, "hassip"))) { snprintf(tmp, sizeof(tmp), "SIP/%s", cat); append_interface(iface, sizeof(iface), tmp); |