Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Correct some set-but-unused variable warnings in the mISDN library.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Kevin P. Fleming 13 years ago
parent 90a6848c67
commit 25a9b03cd1
2 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File

15
channels/misdn/isdn_lib.c
Unescape View File

@ -2316,12 +2316,11 @@ static int handle_timers(msg_t* msg)
break;
}
if (it) {
int ret;
ret = mISDN_write_frame(stack->midev, msg->data, frm->addr,
MGR_TIMER | RESPONSE, 0, 0, NULL, TIMEOUT_1SEC);
mISDN_write_frame(stack->midev, msg->data, frm->addr,
MGR_TIMER | RESPONSE, 0, 0, NULL, TIMEOUT_1SEC);
test_and_clear_bit(FLG_TIMER_RUNING, (long unsigned int *)&it->Flags);
pthread_mutex_lock(&stack->nstlock);
ret = it->function(it->data);
it->function(it->data);
pthread_mutex_unlock(&stack->nstlock);
free_msg(msg);
return 1;
@ -4516,7 +4515,6 @@ void manager_bchannel_activate(struct misdn_bchannel *bc)
void manager_bchannel_deactivate(struct misdn_bchannel * bc)
{
struct misdn_stack *stack=get_stack_by_bc(bc);
iframe_t dact;
char buf[128];
switch (bc->bc_state) {
@ -4535,10 +4533,6 @@ void manager_bchannel_deactivate(struct misdn_bchannel * bc)
bc->generate_tone=0;
dact.prim = DL_RELEASE | REQUEST;
dact.addr = bc->addr | FLG_MSG_DOWN;
dact.dinfo = 0;
dact.len = 0;
mISDN_write_frame(stack->midev, buf, bc->addr | FLG_MSG_DOWN, DL_RELEASE|REQUEST,0,0,NULL, TIMEOUT_1SEC);
clear_ibuffer(bc->astbuf);
@ -4554,7 +4548,6 @@ int misdn_lib_tx2misdn_frm(struct misdn_bchannel *bc, void *data, int len)
struct misdn_stack *stack=get_stack_by_bc(bc);
char buf[4096 + mISDN_HEADER_LEN];
iframe_t *frm = (iframe_t*)buf;
int r;
switch (bc->bc_state) {
case BCHAN_ACTIVATED:
@ -4578,7 +4571,7 @@ int misdn_lib_tx2misdn_frm(struct misdn_bchannel *bc, void *data, int len)
cb_log(6, stack->port, "Writing %d data bytes\n",len);
cb_log(9, stack->port, "Writing %d bytes 2 mISDN\n",len);
r=mISDN_write(stack->midev, buf, frm->len + mISDN_HEADER_LEN, TIMEOUT_INFINIT);
mISDN_write(stack->midev, buf, frm->len + mISDN_HEADER_LEN, TIMEOUT_INFINIT);
return 0;
}

60
channels/misdn/isdn_msg_parser.c
Unescape View File

@ -805,12 +805,8 @@ static void parse_user_information (struct isdn_msg msgs[], msg_t *msg, struct m
static msg_t *build_user_information (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
USER_INFORMATION_t *user_information;
msg_t *msg =(msg_t*)create_l3msg(CC_USER_INFORMATION | REQUEST, MT_USER_INFORMATION, bc?bc->l3_id:-1, sizeof(USER_INFORMATION_t) ,nt);
user_information=(USER_INFORMATION_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building USER_INFORMATION Msg\n");
#endif
@ -828,12 +824,8 @@ static void parse_suspend_reject (struct isdn_msg msgs[], msg_t *msg, struct mis
static msg_t *build_suspend_reject (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
SUSPEND_REJECT_t *suspend_reject;
msg_t *msg =(msg_t*)create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, bc?bc->l3_id:-1, sizeof(SUSPEND_REJECT_t) ,nt);
suspend_reject=(SUSPEND_REJECT_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building SUSPEND_REJECT Msg\n");
#endif
@ -851,12 +843,8 @@ static void parse_resume_reject (struct isdn_msg msgs[], msg_t *msg, struct misd
static msg_t *build_resume_reject (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
RESUME_REJECT_t *resume_reject;
msg_t *msg =(msg_t*)create_l3msg(CC_RESUME_REJECT | REQUEST, MT_RESUME_REJECT, bc?bc->l3_id:-1, sizeof(RESUME_REJECT_t) ,nt);
resume_reject=(RESUME_REJECT_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building RESUME_REJECT Msg\n");
#endif
@ -874,12 +862,8 @@ static void parse_hold (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchanne
static msg_t *build_hold (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
HOLD_t *hold;
msg_t *msg =(msg_t*)create_l3msg(CC_HOLD | REQUEST, MT_HOLD, bc?bc->l3_id:-1, sizeof(HOLD_t) ,nt);
hold=(HOLD_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building HOLD Msg\n");
#endif
@ -897,12 +881,8 @@ static void parse_suspend (struct isdn_msg msgs[], msg_t *msg, struct misdn_bcha
static msg_t *build_suspend (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
SUSPEND_t *suspend;
msg_t *msg =(msg_t*)create_l3msg(CC_SUSPEND | REQUEST, MT_SUSPEND, bc?bc->l3_id:-1, sizeof(SUSPEND_t) ,nt);
suspend=(SUSPEND_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building SUSPEND Msg\n");
#endif
@ -920,12 +900,8 @@ static void parse_resume (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchan
static msg_t *build_resume (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
RESUME_t *resume;
msg_t *msg =(msg_t*)create_l3msg(CC_RESUME | REQUEST, MT_RESUME, bc?bc->l3_id:-1, sizeof(RESUME_t) ,nt);
resume=(RESUME_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building RESUME Msg\n");
#endif
@ -943,12 +919,8 @@ static void parse_hold_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct m
static msg_t *build_hold_acknowledge (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
HOLD_ACKNOWLEDGE_t *hold_acknowledge;
msg_t *msg =(msg_t*)create_l3msg(CC_HOLD_ACKNOWLEDGE | REQUEST, MT_HOLD_ACKNOWLEDGE, bc?bc->l3_id:-1, sizeof(HOLD_ACKNOWLEDGE_t) ,nt);
hold_acknowledge=(HOLD_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building HOLD_ACKNOWLEDGE Msg\n");
#endif
@ -966,12 +938,8 @@ static void parse_suspend_acknowledge (struct isdn_msg msgs[], msg_t *msg, struc
static msg_t *build_suspend_acknowledge (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
SUSPEND_ACKNOWLEDGE_t *suspend_acknowledge;
msg_t *msg =(msg_t*)create_l3msg(CC_SUSPEND_ACKNOWLEDGE | REQUEST, MT_SUSPEND_ACKNOWLEDGE, bc?bc->l3_id:-1, sizeof(SUSPEND_ACKNOWLEDGE_t) ,nt);
suspend_acknowledge=(SUSPEND_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building SUSPEND_ACKNOWLEDGE Msg\n");
#endif
@ -989,12 +957,8 @@ static void parse_resume_acknowledge (struct isdn_msg msgs[], msg_t *msg, struct
static msg_t *build_resume_acknowledge (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
RESUME_ACKNOWLEDGE_t *resume_acknowledge;
msg_t *msg =(msg_t*)create_l3msg(CC_RESUME_ACKNOWLEDGE | REQUEST, MT_RESUME_ACKNOWLEDGE, bc?bc->l3_id:-1, sizeof(RESUME_ACKNOWLEDGE_t) ,nt);
resume_acknowledge=(RESUME_ACKNOWLEDGE_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building RESUME_ACKNOWLEDGE Msg\n");
#endif
@ -1012,12 +976,8 @@ static void parse_hold_reject (struct isdn_msg msgs[], msg_t *msg, struct misdn_
static msg_t *build_hold_reject (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
HOLD_REJECT_t *hold_reject;
msg_t *msg =(msg_t*)create_l3msg(CC_HOLD_REJECT | REQUEST, MT_HOLD_REJECT, bc?bc->l3_id:-1, sizeof(HOLD_REJECT_t) ,nt);
hold_reject=(HOLD_REJECT_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building HOLD_REJECT Msg\n");
#endif
@ -1035,12 +995,8 @@ static void parse_retrieve (struct isdn_msg msgs[], msg_t *msg, struct misdn_bch
static msg_t *build_retrieve (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
RETRIEVE_t *retrieve;
msg_t *msg =(msg_t*)create_l3msg(CC_RETRIEVE | REQUEST, MT_RETRIEVE, bc?bc->l3_id:-1, sizeof(RETRIEVE_t) ,nt);
retrieve=(RETRIEVE_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building RETRIEVE Msg\n");
#endif
@ -1082,12 +1038,8 @@ static void parse_retrieve_reject (struct isdn_msg msgs[], msg_t *msg, struct mi
static msg_t *build_retrieve_reject (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
RETRIEVE_REJECT_t *retrieve_reject;
msg_t *msg =(msg_t*)create_l3msg(CC_RETRIEVE_REJECT | REQUEST, MT_RETRIEVE_REJECT, bc?bc->l3_id:-1, sizeof(RETRIEVE_REJECT_t) ,nt);
retrieve_reject=(RETRIEVE_REJECT_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building RETRIEVE_REJECT Msg\n");
#endif
@ -1577,12 +1529,8 @@ static void parse_status_enquiry (struct isdn_msg msgs[], msg_t *msg, struct mis
static msg_t *build_status_enquiry (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
STATUS_ENQUIRY_t *status_enquiry;
msg_t *msg =(msg_t*)create_l3msg(CC_STATUS_ENQUIRY | REQUEST, MT_STATUS_ENQUIRY, bc?bc->l3_id:-1, sizeof(STATUS_ENQUIRY_t) ,nt);
status_enquiry=(STATUS_ENQUIRY_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building STATUS_ENQUIRY Msg\n");
#endif
@ -1645,12 +1593,8 @@ static void parse_status (struct isdn_msg msgs[], msg_t *msg, struct misdn_bchan
static msg_t *build_status (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
STATUS_t *status;
msg_t *msg =(msg_t*)create_l3msg(CC_STATUS | REQUEST, MT_STATUS, bc?bc->l3_id:-1, sizeof(STATUS_t) ,nt);
status=(STATUS_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building STATUS Msg\n");
#endif
@ -1666,12 +1610,8 @@ static void parse_timeout (struct isdn_msg msgs[], msg_t *msg, struct misdn_bcha
static msg_t *build_timeout (struct isdn_msg msgs[], struct misdn_bchannel *bc, int nt)
{
int HEADER_LEN = nt?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
STATUS_t *status;
msg_t *msg =(msg_t*)create_l3msg(CC_STATUS | REQUEST, MT_STATUS, bc?bc->l3_id:-1, sizeof(STATUS_t) ,nt);
status=(STATUS_t*)((msg->data+HEADER_LEN));
#ifdef DEBUG
printf("Building STATUS Msg\n");
#endif

Write Preview
Loading…
Cancel
Save