diff options
| author | Sean Bright <sean@malleable.com> | 2008-08-09 12:53:57 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-08-09 12:53:57 +0000 |
| commit | bea1644dc27af9d6f48cbeb8fce118122c761b5f (patch) | |
| tree | 5b4be7cfd39b71f459a41c650fab62f5f4f946fe /channels/chan_jingle.c | |
| parent | c5a119d86d5e5f452bd3cea2d0f61bb0cfdef283 (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: https://origsvn.digium.com/svn/asterisk/trunk@136888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 43b178426..628461887 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -161,7 +161,7 @@ struct jingle_container { }; static const char desc[] = "Jingle Channel"; -static const char type[] = "Jingle"; +static const char channel_type[] = "Jingle"; static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263; @@ -1464,7 +1464,7 @@ static int jingle_hangup(struct ast_channel *ast) } /*! \brief Part of PBX interface */ -static struct ast_channel *jingle_request(const char *type, int format, void *data, int *cause) +static struct ast_channel *jingle_request(const char *request_type, int format, void *data, int *cause) { struct jingle_pvt *p = NULL; struct jingle *client = NULL; @@ -1882,7 +1882,7 @@ static int load_module(void) ast_cli_register_multiple(jingle_cli, ARRAY_LEN(jingle_cli)); /* Make sure we can register our channel type */ if (ast_channel_register(&jingle_tech)) { - ast_log(LOG_ERROR, "Unable to register channel class %s\n", type); + ast_log(LOG_ERROR, "Unable to register channel class %s\n", channel_type); return -1; } return 0; |