- tm fifo fix

 - more warnings killed

Makefile.defs

@@ -50,7 +50,7 @@ MAIN_NAME=ser
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL =   99
-EXTRAVERSION = -dev16
+EXTRAVERSION = -dev17
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

modules/tm/t_fifo.c

@@ -409,7 +409,7 @@ int parse_tw_append( modparam_t type, param_func_param_t param_val)
 	return 0;
 parse_error:
 	LOG(L_ERR,"ERROR:tm:parse_tw_append: parse error in <%s> around "
-		"position %d\n", param_val.string, s-param_val.string);
+		"position %ld\n", param_val.string, (long)(s-param_val.string));
 error:
 	return -1;
 }
@@ -822,8 +822,8 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)
 	int2reverse_hex(&s, &l, (int)msg->msg_flags);
 	append_chr(s,'\n');
 
-	if ( (s=append2buf( s, APPEND_BUFFER_MAX-(s-append.s), msg,
-	twi->append->elems))==0 )
+	if ( twi->append && ((s=append2buf( s, APPEND_BUFFER_MAX-(s-append.s), msg,
+	twi->append->elems))==0) )
 		goto error;
 
 	/* body separator */

modules/tm/timer.c

@@ -641,6 +641,7 @@ static void insert_timer_unsafe( struct timer *timer_list, struct timer_link *tl
 
 
 
+#if 0  /* not used anymore */
 /* put a new cell into a list nr. list_id */
 static void add_timer_unsafe( struct timer *timer_list, struct timer_link *tl,
 	unsigned int time_out )
@@ -667,7 +668,7 @@ static void add_timer_unsafe( struct timer *timer_list, struct timer_link *tl,
 #endif
 	DBG("DEBUG: add_timer_unsafe[%d]: %p\n",timer_list->id,tl);
 }
-
+#endif