diff options
| author | Sean Bright <sean@malleable.com> | 2012-03-08 17:02:52 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-03-08 17:02:52 +0000 |
| commit | 99bd5b1e2e70160b2d3f6dcbd122b06654c17788 (patch) | |
| tree | db17db12c4d7846442c746f0997325801cb96415 /channels/chan_phone.c | |
| parent | a8116350bc47069650de7d08353d8c1c6d6bfe4b (diff) | |
Eliminate a bunch of shadow warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_phone.c')
| -rw-r--r-- | channels/chan_phone.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 6926a7d4f..f7e7c335e 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -1018,7 +1018,7 @@ static void *do_monitor(void *data) struct phone_pvt *i; int tonepos = 0; /* The tone we're playing this round */ - struct timeval tv = { 0, 0 }; + struct timeval to = { 0, 0 }; int dotone; /* This thread monitors all the frame relay interfaces which are not yet in use (and thus do not have a separate thread) indefinitely */ @@ -1055,7 +1055,7 @@ static void *do_monitor(void *data) if (i->dialtone && i->mode != MODE_SIGMA) { /* Remember we're going to have to come back and play more dialtones */ - if (ast_tvzero(tv)) { + if (ast_tvzero(to)) { /* If we're due for a dialtone, play one */ if (write(i->fd, DialTone + tonepos, 240) != 240) { ast_log(LOG_WARNING, "Dial tone write error\n"); @@ -1075,13 +1075,13 @@ static void *do_monitor(void *data) if (tonepos >= sizeof(DialTone)) { tonepos = 0; } - if (ast_tvzero(tv)) { - tv = ast_tv(0, 30000); + if (ast_tvzero(to)) { + to = ast_tv(0, 30000); } - res = ast_poll2(fds, inuse_fds, &tv); + res = ast_poll2(fds, inuse_fds, &to); } else { res = ast_poll(fds, inuse_fds, -1); - tv = ast_tv(0, 0); + to = ast_tv(0, 0); tonepos = 0; } /* Okay, select has finished. Let's see what happened. */ @@ -1437,7 +1437,6 @@ static int load_module(void) } else if (!strcasecmp(v->name, "context")) { ast_copy_string(context, v->value, sizeof(context)); } else if (!strcasecmp(v->name, "format")) { - struct ast_format tmpfmt; if (!strcasecmp(v->value, "g729")) { ast_format_cap_set(prefcap, ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0)); } else if (!strcasecmp(v->value, "g723.1")) { |