- 64-bit cleanup; action->{p1,p2,p3}.number changed from int to long

action.c

@@ -339,7 +339,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 			}
 			if ((a->p1.number>RT_NO)||(a->p1.number<0)){
 				LOG(L_ERR, "ERROR: invalid routing table number in"
-							"route(%d)\n", a->p1.number);
+							"route(%lu)\n", a->p1.number);
 				ret=E_CFG;
 				break;
 			}
@@ -457,7 +457,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 				} else if (a->type==STRIP_T) {
 					if (a->p1.number>uri.user.len) {
 						LOG(L_WARN, "Error: too long strip asked; "
-									" deleting username: %d of <%.*s>\n",
+									" deleting username: %lu of <%.*s>\n",
 									a->p1.number, uri.user.len, uri.user.s );
 						len=0;
 					} else if (a->p1.number==uri.user.len) {
@@ -469,7 +469,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 				} else if (a->type==STRIP_TAIL_T) {
 					if (a->p1.number>uri.user.len) {
 						LOG(L_WARN, "WARNING: too long strip_tail asked; "
-									" deleting username: %d of <%.*s>\n",
+									" deleting username: %lu of <%.*s>\n",
 									a->p1.number, uri.user.len, uri.user.s );
 						len=0;
 					} else if (a->p1.number==uri.user.len) {

route_struct.c

@@ -325,7 +325,7 @@ void print_action(struct action* a)
 					DBG("\"%s\"", t->p1.string);
 					break;
 			case NUMBER_ST:
-					DBG("%d",t->p1.number);
+					DBG("%lu",t->p1.number);
 					break;
 			case IP_ST:
 					print_ip((struct ip_addr*)t->p1.data);
@@ -350,7 +350,7 @@ void print_action(struct action* a)
 					DBG(", \"%s\"", t->p2.string);
 					break;
 			case NUMBER_ST:
-					DBG(", %d",t->p2.number);
+					DBG(", %lu",t->p2.number);
 					break;
 			case EXPR_ST:
 					print_expr((struct expr*)t->p2.data);
@@ -369,7 +369,7 @@ void print_action(struct action* a)
 					DBG(", \"%s\"", t->p3.string);
 					break;
 			case NUMBER_ST:
-					DBG(", %d",t->p3.number);
+					DBG(", %lu",t->p3.number);
 					break;
 			case EXPR_ST:
 					print_expr((struct expr*)t->p3.data);

route_struct.h

@@ -94,7 +94,7 @@ struct action{
 	int p2_type;
 	int p3_type;
 	union {
-		int number;
+		long number;
 		char* string;
 		void* data;
 	}p1, p2, p3;