From: Travis Cross Date: Wed, 9 Apr 2014 07:11:15 +0000 (+0000) Subject: Move variables down into loop where they're used X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e8a053464243f6a3a77fe890b509edd35287f21;p=thirdparty%2Ffreeswitch.git Move variables down into loop where they're used These variables aren't used outside of this for loop, so they should be declared within it. --- diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c index 3313b8c714..64f154747b 100644 --- a/src/switch_ivr_play_say.c +++ b/src/switch_ivr_play_say.c @@ -202,10 +202,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro_event(switch_core_sessio if (pattern) { switch_regex_t *re = NULL; int proceed = 0, ovector[100]; - char *substituted = NULL; - uint32_t len = 0; - char *odata = NULL; - char *expanded = NULL; switch_xml_t match = NULL; status = SWITCH_STATUS_SUCCESS; @@ -221,6 +217,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro_event(switch_core_sessio for (action = switch_xml_child(match, "action"); action && status == SWITCH_STATUS_SUCCESS; action = action->next) { char *adata = (char *) switch_xml_attr_soft(action, "data"); char *func = (char *) switch_xml_attr_soft(action, "function"); + char *substituted = NULL; + uint32_t len = 0; + char *odata = NULL; + char *expanded = NULL; if (strchr(pattern, '(') && strchr(adata, '$') && proceed > 0) { len = (uint32_t) (strlen(data) + strlen(adata) + 10) * proceed;