diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-10 14:45:25 +0000 |
| commit | 3ffb39833b25a02108214d7584733bc6b9c334df (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_macro.c | |
| parent | 357bf3e90be71578e0b32303c41c5d29f2714c2b (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_macro.c')
| -rw-r--r-- | apps/app_macro.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index a50dfb4bb..8fe59634e 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -253,12 +253,12 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) ast_channel_lock(chan); while((cur = strsep(&rest, ",")) && (argc < MAX_ARGS)) { - const char *s; + const char *argp; /* Save copy of old arguments if we're overwriting some, otherwise let them pass through to the other macro */ snprintf(varname, sizeof(varname), "ARG%d", argc); - if ((s = pbx_builtin_getvar_helper(chan, varname))) { - oldargs[argc] = ast_strdup(s); + if ((argp = pbx_builtin_getvar_helper(chan, varname))) { + oldargs[argc] = ast_strdup(argp); } pbx_builtin_setvar_helper(chan, varname, cur); argc++; @@ -329,12 +329,12 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) gosub_level++; ast_debug(1, "Incrementing gosub_level\n"); } else if (!strcasecmp(runningapp, "GOSUBIF")) { - char tmp2[1024], *cond, *app, *app2 = tmp2; + char tmp2[1024], *cond, *app_arg, *app2 = tmp2; pbx_substitute_variables_helper(chan, runningdata, tmp2, sizeof(tmp2) - 1); cond = strsep(&app2, "?"); - app = strsep(&app2, ":"); + app_arg = strsep(&app2, ":"); if (pbx_checkcondition(cond)) { - if (!ast_strlen_zero(app)) { + if (!ast_strlen_zero(app_arg)) { gosub_level++; ast_debug(1, "Incrementing gosub_level\n"); } |