From f87a845d9ebb91cb81eb2ff0a4ceec8548bbf53e Mon Sep 17 00:00:00 2001 From: kpfleming Date: Thu, 13 Apr 2006 17:52:23 +0000 Subject: Merged revisions 19812 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r19812 | kpfleming | 2006-04-13 12:40:21 -0500 (Thu, 13 Apr 2006) | 2 lines oops... let's not set a variable and then immediately overwrite it while assuming its old value will magically return ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@19818 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_page.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/app_page.c b/apps/app_page.c index 6898bfa27..bd050d183 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -171,16 +171,16 @@ static int page_exec(struct ast_channel *chan, void *data) return -1; } + ast_copy_string(originator, chan->name, sizeof(originator)); + if ((tmp = strchr(originator, '-'))) + *tmp = '\0'; + tmp = strsep(&options, "|"); if (options) ast_app_parse_options(page_opts, &flags, NULL, options); snprintf(meetmeopts, sizeof(meetmeopts), "%ud|%sqxdw", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m"); - ast_copy_string(originator, chan->name, sizeof(originator)); - if ((tmp = strchr(originator, '-'))) - *tmp = '\0'; - while ((tech = strsep(&tmp, "&"))) { /* don't call the originating device */ if (!strcasecmp(tech, originator)) -- cgit v1.2.3