[asterisk-commits] branch 1.2-netsec r19818 - in /branches/1.2-netsec: ./ apps/app_page.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Apr 13 12:52:23 2006
New Revision: 19818

URL: http://svn.digium.com/view/asterisk?rev=19818&view=rev
Log:
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

........

Modified:
    branches/1.2-netsec/   (props changed)
    branches/1.2-netsec/apps/app_page.c

Propchange: branches/1.2-netsec/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 13 12:52:23 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-19807
+/branches/1.2:1-19817

Modified: branches/1.2-netsec/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/branches/1.2-netsec/apps/app_page.c?rev=19818&r1=19817&r2=19818&view=diff
==============================================================================
--- branches/1.2-netsec/apps/app_page.c (original)
+++ branches/1.2-netsec/apps/app_page.c Thu Apr 13 12:52:23 2006
@@ -171,15 +171,15 @@
 		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 */