diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-13 17:41:43 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-13 17:41:43 +0000 |
| commit | f56a09fbebf3d3f4f48c6f66a42363de53c75244 (patch) | |
| tree | 03d65460a19317e776216212f326f2159fc21a37 /apps/app_page.c | |
| parent | d56769a1f397b6f305ebe64eb367352ce624418c (diff) | |
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/trunk@19813 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_page.c')
| -rw-r--r-- | apps/app_page.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_page.c b/apps/app_page.c index 11d90cb21..720c7abb7 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -167,16 +167,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)) |