diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
commit | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (patch) | |
tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_dahdiscan.c | |
parent | 1013afa1ad09d854207d24d3aed691321fecc100 (diff) |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dahdiscan.c')
-rw-r--r-- | apps/app_dahdiscan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c index 6ed55dd7d..a8a939725 100644 --- a/apps/app_dahdiscan.c +++ b/apps/app_dahdiscan.c @@ -284,7 +284,7 @@ static int conf_exec(struct ast_channel *chan, void *data) int res=-1; int confflags = 0; int confno = 0; - char confstr[80] = "", *tmp = NULL; + char confnostr[80] = "", *tmp = NULL; struct ast_channel *tempchan = NULL, *lastchan = NULL, *ichan = NULL; struct ast_frame *f; char *desired_group; @@ -335,12 +335,12 @@ static int conf_exec(struct ast_channel *chan, void *data) } if (tempchan && (!strcmp(tempchan->tech->type, "DAHDI")) && (tempchan != chan)) { ast_verb(3, "DAHDI channel %s is in-use, monitoring...\n", tempchan->name); - ast_copy_string(confstr, tempchan->name, sizeof(confstr)); + ast_copy_string(confnostr, tempchan->name, sizeof(confnostr)); ast_channel_unlock(tempchan); - if ((tmp = strchr(confstr, '-'))) { + if ((tmp = strchr(confnostr, '-'))) { *tmp = '\0'; } - confno = atoi(strchr(confstr, '/') + 1); + confno = atoi(strchr(confnostr, '/') + 1); ast_stopstream(chan); ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language, (char *) NULL); res = conf_run(chan, confno, confflags); |