diff options
author | Jason Parker <jparker@digium.com> | 2006-11-16 22:51:00 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2006-11-16 22:51:00 +0000 |
commit | 65fb29bc0385f874ea7ebbd6b0f9ed95444561c3 (patch) | |
tree | aed7212c76469bc94333036be2c9f08057db5c4a /channels | |
parent | 2c9643d49f5bcb70afb5f9a6b55b016c77d21084 (diff) |
Remove the interim variable for range modifications, and set it on the structure directly.
Also move the default checking to where it gets set initially.
Fixes suggested by file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_zap.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 24f886c8f..d5f96e57a 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6615,9 +6615,6 @@ static void *ss_thread(void *data) channel */ distMatches = 0; for (counter1 = 0; counter1 < 3; counter1++) { - if (p->drings.ringnum[counter].range == 0) { - p->drings.ringnum[counter].range = 10; - } ast_verbose( VERBOSE_PREFIX_3 "Ring pattern check range: %d\n", p->drings.ringnum[counter].range); if (p->drings.ringnum[counter].ring[counter1] == -1) { ast_verbose( VERBOSE_PREFIX_3 "Pattern ignore (-1) detected, so matching pattern %d regardless.\n", @@ -6804,9 +6801,6 @@ static void *ss_thread(void *data) p->drings.ringnum[counter].ring[2]); distMatches = 0; for (counter1 = 0; counter1 < 3; counter1++) { - if (p->drings.ringnum[counter].range == 0) { - p->drings.ringnum[counter].range = 10; - } ast_verbose( VERBOSE_PREFIX_3 "Ring pattern check range: %d\n", p->drings.ringnum[counter].range); if (p->drings.ringnum[counter].ring[counter1] == -1) { ast_verbose( VERBOSE_PREFIX_3 "Pattern ignore (-1) detected, so matching pattern %d regardless.\n", @@ -11723,7 +11717,6 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels) struct zt_pvt *tmp; char *ringc; int y; - int range; int found_pseudo = 0; for (; v; v = v->next) { @@ -11753,14 +11746,20 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels) } else if (!strcasecmp(v->name, "dring3context")) { ast_copy_string(drings.ringContext[2].contextData,v->value,sizeof(drings.ringContext[2].contextData)); } else if (!strcasecmp(v->name, "dring1range")) { - range = atoi(v->value); - drings.ringnum[0].range = range; + drings.ringnum[0].range = atoi(v->value); + /* 10 is a nice default. */ + if (drings.ringnum[0].range == 0) + drings.ringnum[0].range = 10; } else if (!strcasecmp(v->name, "dring2range")) { - range = atoi(v->value); - drings.ringnum[1].range = range; + drings.ringnum[1].range = atoi(v->value); + /* 10 is a nice default. */ + if (drings.ringnum[1].range == 0) + drings.ringnum[1].range = 10; } else if (!strcasecmp(v->name, "dring3range")) { - range = atoi(v->value); - drings.ringnum[2].range = range; + drings.ringnum[2].range = atoi(v->value); + /* 10 is a nice default. */ + if (drings.ringnum[2].range == 0) + drings.ringnum[2].range = 10; } else if (!strcasecmp(v->name, "dring1")) { ringc = v->value; sscanf(ringc, "%d,%d,%d", &drings.ringnum[0].ring[0], &drings.ringnum[0].ring[1], &drings.ringnum[0].ring[2]); |