diff options
Diffstat (limited to 'apps/app_macro.c')
| -rw-r--r-- | apps/app_macro.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index ab80fbc38..5c50a9f40 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -21,7 +21,7 @@ * \brief Dial plan macro Implementation * * \author Mark Spencer <markster@digium.com> - * + * * \ingroup applications */ @@ -274,16 +274,16 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive if ((s = pbx_builtin_getvar_helper(chan, "MACRO_RECURSION"))) { sscanf(s, "%30d", &maxdepth); } - + /* Count how many levels deep the rabbit hole goes */ if ((s = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH"))) { sscanf(s, "%30d", &depth); } - + /* Used for detecting whether to return when a Macro is called from another Macro after hangup */ if (strcmp(ast_channel_exten(chan), "h") == 0) pbx_builtin_setvar_helper(chan, "MACRO_IN_HANGUP", "1"); - + if ((inhangupc = pbx_builtin_getvar_helper(chan, "MACRO_IN_HANGUP"))) { sscanf(inhangupc, "%30d", &inhangup); } @@ -371,7 +371,7 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive save_macro_priority = ast_strdup(pbx_builtin_getvar_helper(chan, "MACRO_PRIORITY")); snprintf(pc, sizeof(pc), "%d", oldpriority); pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", pc); - + save_macro_offset = ast_strdup(pbx_builtin_getvar_helper(chan, "MACRO_OFFSET")); pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", NULL); @@ -612,7 +612,7 @@ static int macroexclusive_exec(struct ast_channel *chan, const char *data) return _macro_exec(chan, data, 1); } -static int macroif_exec(struct ast_channel *chan, const char *data) +static int macroif_exec(struct ast_channel *chan, const char *data) { char *expr = NULL, *label_a = NULL, *label_b = NULL; int res = 0; @@ -628,14 +628,14 @@ static int macroif_exec(struct ast_channel *chan, const char *data) } if (pbx_checkcondition(expr)) res = macro_exec(chan, label_a); - else if (label_b) + else if (label_b) res = macro_exec(chan, label_b); } else ast_log(LOG_WARNING, "Invalid Syntax.\n"); return res; } - + static int macro_exit_exec(struct ast_channel *chan, const char *data) { return MACRO_EXIT_RESULT; |