[sr-dev] git:master: tm: fix warnings/eliminate unused variables

Andrei Pelinescu-Onciul andrei at iptel.org
Sat Jun 11 11:34:04 CEST 2011


Module: sip-router
Branch: master
Commit: b6cb8823682e3a1f7881bf0e0a3ce3053bb5895c
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6cb8823682e3a1f7881bf0e0a3ce3053bb5895c

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Sat Jun 11 11:31:43 2011 +0200

tm: fix warnings/eliminate unused variables

Eliminate initialized, but unused variables (reported by gcc 4.6).

---

 modules/tm/t_lookup.c |    2 --
 modules/tm/timer.h    |    4 ----
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c
index e69fdec..b626a1f 100644
--- a/modules/tm/t_lookup.c
+++ b/modules/tm/t_lookup.c
@@ -503,7 +503,6 @@ int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked,
 	struct cell         *p_cell;
 	unsigned int       isACK;
 	struct sip_msg  *t_msg;
-	int ret;
 	struct via_param *branch;
 	int match_status;
 	struct cell *e2e_ack_trans;
@@ -529,7 +528,6 @@ int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked,
 
 
 	/* assume not found */
-	ret=-1;
 	e2e_ack_trans = 0;
 
 	/* first of all, look if there is RFC3261 magic cookie in branch; if
diff --git a/modules/tm/timer.h b/modules/tm/timer.h
index 0160535..7810169 100644
--- a/modules/tm/timer.h
+++ b/modules/tm/timer.h
@@ -241,14 +241,10 @@ inline static void change_retr(struct cell* t, int now,
 								ticks_t rt_t1, ticks_t rt_t2)
 {
 	int i;
-	ticks_t new_rt1_expire, new_rt2_expire, crt;
 
 	if (rt_t1) t->rt_t1_timeout=rt_t1;
 	if (rt_t2) t->rt_t2_timeout=rt_t2;
 	if (now){
-		crt=get_ticks_raw();
-		new_rt1_expire=crt+rt_t1;
-		new_rt2_expire=crt+rt_t2;
 		for (i=0; i<t->nr_of_outgoings; i++){
 			if (t->uac[i].request.t_active){ 
 					if ((t->uac[i].request.flags & F_RB_T2) && rt_t2)




More information about the sr-dev mailing list