- various warning fixes

Makefile

@@ -52,7 +52,7 @@ exclude_modules?= 			acc cpl ext extcmd radius_acc radius_auth vm \
 							jabber mysql \
 							cpl-c \
 							auth_radius group_radius uri_radius avp_radius \
-							acc_radius dialog pa rls xmlrpc osp tls
+							acc_radius dialog pa rls xmlrpc osp tls 
 # always exclude the CVS dir
 override exclude_modules+= CVS $(skip_modules)
 

Makefile.defs

@@ -61,7 +61,7 @@ MAIN_NAME=ser
 VERSION = 0
 PATCHLEVEL = 10
 SUBLEVEL =   99
-EXTRAVERSION = -dev31-tm-cancel
+EXTRAVERSION = -dev32
 
 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \
 			$(SUBLEVEL) )

cfg.y

@@ -1561,7 +1561,7 @@ cmd:
 							i_tmp=get_flag_no($3, strlen($3));
 							if (i_tmp<0) yyerror("flag not declared");
 							$$=mk_action(SETFLAG_T, 1, NUMBER_ST,
-										(void*)i_tmp); 
+										(void*)(long)i_tmp); 
 									}
 	| SETFLAG error			{ $$=0; yyerror("missing '(' or ')'?"); }
 	| RESETFLAG LPAREN NUMBER RPAREN {
@@ -1573,7 +1573,7 @@ cmd:
 							i_tmp=get_flag_no($3, strlen($3));
 							if (i_tmp<0) yyerror("flag not declared");
 							$$=mk_action(RESETFLAG_T, 1, NUMBER_ST,
-										(void*)i_tmp); 
+										(void*)(long)i_tmp); 
 									}
 	| RESETFLAG error		{ $$=0; yyerror("missing '(' or ')'?"); }
 	| ISFLAGSET LPAREN NUMBER RPAREN {
@@ -1585,7 +1585,7 @@ cmd:
 							i_tmp=get_flag_no($3, strlen($3));
 							if (i_tmp<0) yyerror("flag not declared");
 							$$=mk_action(ISFLAGSET_T, 1, NUMBER_ST,
-										(void*)i_tmp); 
+										(void*)(long)i_tmp); 
 									}
 	| ISFLAGSET error { $$=0; yyerror("missing '(' or ')'?"); }
 	| ERROR LPAREN STRING COMMA STRING RPAREN {$$=mk_action(ERROR_T, 2, STRING_ST, $3, STRING_ST, $5); }
@@ -1597,7 +1597,7 @@ cmd:
 							yyerror("internal error");
 							YYABORT;
 						}
-						$$=mk_action(ROUTE_T, 1, NUMBER_ST, (void*)i_tmp); 
+						$$=mk_action(ROUTE_T, 1, NUMBER_ST,(void*)(long)i_tmp);
 										}
 	| ROUTE error { $$=0; yyerror("missing '(' or ')' ?"); }
 	| ROUTE LPAREN error RPAREN { $$=0; yyerror("bad route argument"); }

modules/tm/t_reply.c

@@ -1494,6 +1494,8 @@ error:
 	return -1;
 }
 
+
+#if 0
 static int send_reply(struct cell *trans, unsigned int code, str* text, str* body, str* headers, str* to_tag)
 {
 	struct lump_rpl *hdr_lump, *body_lump;
@@ -1564,6 +1566,7 @@ static int send_reply(struct cell *trans, unsigned int code, str* text, str* bod
  sr_error:
 	return -1;
 }
+#endif
 
 
 const char* rpc_reply_doc[2] = {

modules/tm/t_stats.c

@@ -47,7 +47,6 @@ struct t_stats *tm_stats=0;
 
 int init_tm_stats(void)
 {
-	int size;
 
 	tm_stats = shm_malloc(sizeof(struct t_stats));
 	if (tm_stats==0) {