kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct some 'set-but-not-used' variable warnings.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@350789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2012-01-14 15:23:32 +00:00
parent 689f7d5d6b
commit 3bfed7039f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addons/chan_mobile.c
View File

@@ -2276,14 +2276,13 @@ static int hfp_parse_cmgr(struct hfp_pvt *hfp, char *buf, char **from_number, ch
*/ */
static char *hfp_parse_cusd(struct hfp_pvt *hfp, char *buf) static char *hfp_parse_cusd(struct hfp_pvt *hfp, char *buf)
{ {
int i, state, message_start, message_end; int i, message_start, message_end;
char *cusd; char *cusd;
size_t s; size_t s;
/* parse cusd message in the following format: /* parse cusd message in the following format:
* +CUSD: 0,"100,00 EURO, valid till 01.01.2010, you are using tariff "Mega Tariff". More informations *111#." * +CUSD: 0,"100,00 EURO, valid till 01.01.2010, you are using tariff "Mega Tariff". More informations *111#."
*/ */
state = 0;
message_start = 0; message_start = 0;
message_end = 0; message_end = 0;
s = strlen(buf); s = strlen(buf);
@@ -2681,7 +2680,7 @@ static int hfp_parse_cind_test(struct hfp_pvt *hfp, char *buf)
{ {
int i, state, group; int i, state, group;
size_t s; size_t s;
char *indicator = NULL, *values; char *indicator = NULL;
hfp->nocallsetup = 1; hfp->nocallsetup = 1;
@@ -2720,7 +2719,6 @@ static int hfp_parse_cind_test(struct hfp_pvt *hfp, char *buf)
} }
break; break;
case 5: /* mark the start of the value range */ case 5: /* mark the start of the value range */
values = &buf[i];
state++; state++;
break; break;
case 6: /* find the end of the value range */ case 6: /* find the end of the value range */
@@ -2992,7 +2990,6 @@ static sdp_session_t *sdp_register(void)
sdp_list_t *l2cap_list = 0, *rfcomm_list = 0, *root_list = 0, *proto_list = 0, *access_proto_list = 0, *svc_uuid_list = 0; sdp_list_t *l2cap_list = 0, *rfcomm_list = 0, *root_list = 0, *proto_list = 0, *access_proto_list = 0, *svc_uuid_list = 0;
sdp_data_t *channel = 0; sdp_data_t *channel = 0;
int err = 0;
sdp_session_t *session = 0; sdp_session_t *session = 0;
sdp_record_t *record = sdp_record_alloc(); sdp_record_t *record = sdp_record_alloc();
@@ -3029,7 +3026,7 @@ static sdp_session_t *sdp_register(void)
if (!(session = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY))) if (!(session = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY)))
ast_log(LOG_WARNING, "Failed to connect sdp and create session.\n"); ast_log(LOG_WARNING, "Failed to connect sdp and create session.\n");
else else
err = sdp_record_register(session, record, 0); sdp_record_register(session, record, 0);
sdp_data_free(channel); sdp_data_free(channel);
sdp_list_free(rfcomm_list, 0); sdp_list_free(rfcomm_list, 0);

9
channels/chan_h323.c
View File

@@ -1757,7 +1757,6 @@ static int create_addr(struct oh323_pvt *pvt, char *opeer)
} }
static struct ast_channel *oh323_request(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause) static struct ast_channel *oh323_request(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause)
{ {
format_t oldformat;
struct oh323_pvt *pvt; struct oh323_pvt *pvt;
struct ast_channel *tmpc = NULL; struct ast_channel *tmpc = NULL;
char *dest = (char *)data; char *dest = (char *)data;
@@ -1773,7 +1772,6 @@ static struct ast_channel *oh323_request(const char *type, format_t format, cons
ast_log(LOG_WARNING, "Unable to build pvt data for '%s'\n", (char *)data); ast_log(LOG_WARNING, "Unable to build pvt data for '%s'\n", (char *)data);
return NULL; return NULL;
} }
oldformat = format;
format &= AST_FORMAT_AUDIO_MASK; format &= AST_FORMAT_AUDIO_MASK;
if (!format) { if (!format) {
ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n", ast_getformatname_multiple(tmp, sizeof(tmp), format)); ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n", ast_getformatname_multiple(tmp, sizeof(tmp), format));
@@ -3201,6 +3199,7 @@ static enum ast_rtp_glue_result oh323_get_rtp_peer(struct ast_channel *chan, str
return res; return res;
} }
#if 0
static char *convertcap(format_t cap) static char *convertcap(format_t cap)
{ {
switch (cap) { switch (cap) {
@@ -3227,6 +3226,7 @@ static char *convertcap(format_t cap)
return NULL; return NULL;
} }
} }
#endif
static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, struct ast_rtp_instance *vrtp, struct ast_rtp_instance *trtp, format_t codecs, int nat_active) static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, struct ast_rtp_instance *vrtp, struct ast_rtp_instance *trtp, format_t codecs, int nat_active)
{ {
@@ -3234,13 +3234,18 @@ static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance
struct oh323_pvt *pvt; struct oh323_pvt *pvt;
struct sockaddr_in them = { 0, }; struct sockaddr_in them = { 0, };
struct sockaddr_in us = { 0, }; struct sockaddr_in us = { 0, };
#if 0 /* Native bridge still isn't ready */
char *mode; char *mode;
#endif
if (!rtp) { if (!rtp) {
return 0; return 0;
} }
#if 0 /* Native bridge still isn't ready */
mode = convertcap(chan->writeformat); mode = convertcap(chan->writeformat);
#endif
pvt = (struct oh323_pvt *) chan->tech_pvt; pvt = (struct oh323_pvt *) chan->tech_pvt;
if (!pvt) { if (!pvt) {
ast_log(LOG_ERROR, "No Private Structure, this is bad\n"); ast_log(LOG_ERROR, "No Private Structure, this is bad\n");