diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 12:53:57 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 12:53:57 +0000 |
| commit | b7fbcbae3fad7e96a0d690429c021cba2f0b4532 (patch) | |
| tree | 5b4be7cfd39b71f459a41c650fab62f5f4f946fe /channels/chan_alsa.c | |
| parent | 474f8606ea7d1060f8cf790040f19cff67afd206 (diff) | |
Merge more changes from the resolve-shadow-warnings branch (henceforth known
as RSW since i am too lazy to keep typing it all out). This time a few of
the channels.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136888 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
| -rw-r--r-- | channels/chan_alsa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 5c2a3957a..9a6f7287c 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -560,12 +560,12 @@ static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state) return tmp; } -static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause) +static struct ast_channel *alsa_request(const char *type, int fmt, void *data, int *cause) { - int oldformat = format; + int oldformat = fmt; struct ast_channel *tmp = NULL; - if (!(format &= AST_FORMAT_SLINEAR)) { + if (!(fmt &= AST_FORMAT_SLINEAR)) { ast_log(LOG_NOTICE, "Asked to get a channel of format '%d'\n", oldformat); return NULL; } |