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 /funcs/func_enum.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 'funcs/func_enum.c')
| -rw-r--r-- | funcs/func_enum.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 378187ec3..d8c8b252d 100644 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -161,7 +161,6 @@ static int function_enum(struct ast_channel *chan, const char *cmd, char *data, AST_APP_ARG(record); AST_APP_ARG(zone); ); - int res = 0; char tech[80]; char dest[256] = "", tmp[2] = "", num[AST_MAX_EXTENSION] = ""; char *s, *p; @@ -205,7 +204,7 @@ static int function_enum(struct ast_channel *chan, const char *cmd, char *data, } } - res = ast_get_enum(chan, num, dest, sizeof(dest), tech, sizeof(tech), args.zone, args.options, record, NULL); + ast_get_enum(chan, num, dest, sizeof(dest), tech, sizeof(tech), args.zone, args.options, record, NULL); p = strchr(dest, ':'); if (p && strcasecmp(tech, "ALL") && !strchr(args.options, 'u')) { @@ -414,7 +413,6 @@ static struct ast_custom_function enum_function = { static int function_txtcidname(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { - int res; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(number); AST_APP_ARG(zone); @@ -438,7 +436,7 @@ static int function_txtcidname(struct ast_channel *chan, const char *cmd, args.zone = "e164.arpa"; } - res = ast_get_txt(chan, args.number, buf, len, args.zone); + ast_get_txt(chan, args.number, buf, len, args.zone); return 0; } |