Merged revisions 19812 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 13 Apr 2006 17:41:43 +0000 (17:41 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 13 Apr 2006 17:41:43 +0000 (17:41 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@19813 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_page.c

index 11d90cb..720c7ab 100644 (file)
@@ -167,16 +167,16 @@ static int page_exec(struct ast_channel *chan, void *data)
                return -1;
        }
 
                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");
 
        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))
        while ((tech = strsep(&tmp, "&"))) {
                /* don't call the originating device */
                if (!strcasecmp(tech, originator))