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: https://origsvn.digium.com/svn/asterisk/trunk@136888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-09 12:53:57 +00:00
parent c5a119d86d
commit bea1644dc2
6 changed files with 74 additions and 74 deletions

View File

@@ -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;
}