Browse code

- various warning fixes

Andrei Pelinescu-Onciul authored on 07/02/2006 19:52:38
Showing 5 changed files
... ...
@@ -52,7 +52,7 @@ exclude_modules?= 			acc cpl ext extcmd radius_acc radius_auth vm \
52 52
 							jabber mysql \
53 53
 							cpl-c \
54 54
 							auth_radius group_radius uri_radius avp_radius \
55
-							acc_radius dialog pa rls xmlrpc osp tls
55
+							acc_radius dialog pa rls xmlrpc osp tls 
56 56
 # always exclude the CVS dir
57 57
 override exclude_modules+= CVS $(skip_modules)
58 58
 
... ...
@@ -61,7 +61,7 @@ MAIN_NAME=ser
61 61
 VERSION = 0
62 62
 PATCHLEVEL = 10
63 63
 SUBLEVEL =   99
64
-EXTRAVERSION = -dev31-tm-cancel
64
+EXTRAVERSION = -dev32
65 65
 
66 66
 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \
67 67
 			$(SUBLEVEL) )
... ...
@@ -1561,7 +1561,7 @@ cmd:
1561 1561
 							i_tmp=get_flag_no($3, strlen($3));
1562 1562
 							if (i_tmp<0) yyerror("flag not declared");
1563 1563
 							$$=mk_action(SETFLAG_T, 1, NUMBER_ST,
1564
-										(void*)i_tmp); 
1564
+										(void*)(long)i_tmp); 
1565 1565
 									}
1566 1566
 	| SETFLAG error			{ $$=0; yyerror("missing '(' or ')'?"); }
1567 1567
 	| RESETFLAG LPAREN NUMBER RPAREN {
... ...
@@ -1573,7 +1573,7 @@ cmd:
1573 1573
 							i_tmp=get_flag_no($3, strlen($3));
1574 1574
 							if (i_tmp<0) yyerror("flag not declared");
1575 1575
 							$$=mk_action(RESETFLAG_T, 1, NUMBER_ST,
1576
-										(void*)i_tmp); 
1576
+										(void*)(long)i_tmp); 
1577 1577
 									}
1578 1578
 	| RESETFLAG error		{ $$=0; yyerror("missing '(' or ')'?"); }
1579 1579
 	| ISFLAGSET LPAREN NUMBER RPAREN {
... ...
@@ -1585,7 +1585,7 @@ cmd:
1585 1585
 							i_tmp=get_flag_no($3, strlen($3));
1586 1586
 							if (i_tmp<0) yyerror("flag not declared");
1587 1587
 							$$=mk_action(ISFLAGSET_T, 1, NUMBER_ST,
1588
-										(void*)i_tmp); 
1588
+										(void*)(long)i_tmp); 
1589 1589
 									}
1590 1590
 	| ISFLAGSET error { $$=0; yyerror("missing '(' or ')'?"); }
1591 1591
 	| ERROR LPAREN STRING COMMA STRING RPAREN {$$=mk_action(ERROR_T, 2, STRING_ST, $3, STRING_ST, $5); }
... ...
@@ -1597,7 +1597,7 @@ cmd:
1597 1597
 							yyerror("internal error");
1598 1598
 							YYABORT;
1599 1599
 						}
1600
-						$$=mk_action(ROUTE_T, 1, NUMBER_ST, (void*)i_tmp); 
1600
+						$$=mk_action(ROUTE_T, 1, NUMBER_ST,(void*)(long)i_tmp);
1601 1601
 										}
1602 1602
 	| ROUTE error { $$=0; yyerror("missing '(' or ')' ?"); }
1603 1603
 	| ROUTE LPAREN error RPAREN { $$=0; yyerror("bad route argument"); }
... ...
@@ -1494,6 +1494,8 @@ error:
1494 1494
 	return -1;
1495 1495
 }
1496 1496
 
1497
+
1498
+#if 0
1497 1499
 static int send_reply(struct cell *trans, unsigned int code, str* text, str* body, str* headers, str* to_tag)
1498 1500
 {
1499 1501
 	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
1564 1564
  sr_error:
1565 1565
 	return -1;
1566 1566
 }
1567
+#endif
1567 1568
 
1568 1569
 
1569 1570
 const char* rpc_reply_doc[2] = {
... ...
@@ -47,7 +47,6 @@ struct t_stats *tm_stats=0;
47 47
 
48 48
 int init_tm_stats(void)
49 49
 {
50
-	int size;
51 50
 
52 51
 	tm_stats = shm_malloc(sizeof(struct t_stats));
53 52
 	if (tm_stats==0) {