diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-10 14:45:25 +0000 |
| commit | 3ffb39833b25a02108214d7584733bc6b9c334df (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_dahdibarge.c | |
| parent | 357bf3e90be71578e0b32303c41c5d29f2714c2b (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dahdibarge.c')
| -rw-r--r-- | apps/app_dahdibarge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c index 1c13eb0a3..f16b4dea6 100644 --- a/apps/app_dahdibarge.c +++ b/apps/app_dahdibarge.c @@ -251,11 +251,11 @@ outrun: static int conf_exec(struct ast_channel *chan, void *data) { - int res=-1; + int res = -1; int retrycnt = 0; int confflags = 0; int confno = 0; - char confstr[80] = ""; + char confnostr[80] = ""; if (!ast_strlen_zero(data)) { if ((sscanf(data, "DAHDI/%d", &confno) != 1) && @@ -270,10 +270,10 @@ static int conf_exec(struct ast_channel *chan, void *data) while(!confno && (++retrycnt < 4)) { /* Prompt user for conference number */ - confstr[0] = '\0'; - res = ast_app_getdata(chan, "conf-getchannel",confstr, sizeof(confstr) - 1, 0); + confnostr[0] = '\0'; + res = ast_app_getdata(chan, "conf-getchannel",confnostr, sizeof(confnostr) - 1, 0); if (res <0) goto out; - if (sscanf(confstr, "%d", &confno) != 1) + if (sscanf(confnostr, "%d", &confno) != 1) confno = 0; } if (confno) { |