Browse code

- tm fifo fix - more warnings killed

Andrei Pelinescu-Onciul authored on 19/11/2004 11:34:21
Showing 3 changed files
... ...
@@ -50,7 +50,7 @@ MAIN_NAME=ser
50 50
 VERSION = 0
51 51
 PATCHLEVEL = 8
52 52
 SUBLEVEL =   99
53
-EXTRAVERSION = -dev16
53
+EXTRAVERSION = -dev17
54 54
 
55 55
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
56 56
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -409,7 +409,7 @@ int parse_tw_append( modparam_t type, param_func_param_t param_val)
409 409
 	return 0;
410 410
 parse_error:
411 411
 	LOG(L_ERR,"ERROR:tm:parse_tw_append: parse error in <%s> around "
412
-		"position %d\n", param_val.string, s-param_val.string);
412
+		"position %ld\n", param_val.string, (long)(s-param_val.string));
413 413
 error:
414 414
 	return -1;
415 415
 }
... ...
@@ -822,8 +822,8 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)
822 822
 	int2reverse_hex(&s, &l, (int)msg->msg_flags);
823 823
 	append_chr(s,'\n');
824 824
 
825
-	if ( (s=append2buf( s, APPEND_BUFFER_MAX-(s-append.s), msg,
826
-	twi->append->elems))==0 )
825
+	if ( twi->append && ((s=append2buf( s, APPEND_BUFFER_MAX-(s-append.s), msg,
826
+	twi->append->elems))==0) )
827 827
 		goto error;
828 828
 
829 829
 	/* body separator */
... ...
@@ -641,6 +641,7 @@ static void insert_timer_unsafe( struct timer *timer_list, struct timer_link *tl
641 641
 
642 642
 
643 643
 
644
+#if 0  /* not used anymore */
644 645
 /* put a new cell into a list nr. list_id */
645 646
 static void add_timer_unsafe( struct timer *timer_list, struct timer_link *tl,
646 647
 	unsigned int time_out )
... ...
@@ -667,7 +668,7 @@ static void add_timer_unsafe( struct timer *timer_list, struct timer_link *tl,
667 668
 #endif
668 669
 	DBG("DEBUG: add_timer_unsafe[%d]: %p\n",timer_list->id,tl);
669 670
 }
670
-
671
+#endif
671 672
 
672 673
 
673 674