Browse code

64-bit cleanup from the devel branch.

Jan Janak authored on 26/06/2003 15:27:35
Showing 5 changed files
... ...
@@ -339,7 +339,7 @@ int do_action(struct action* a, struct sip_msg* msg)
339 339
 			}
340 340
 			if ((a->p1.number>RT_NO)||(a->p1.number<0)){
341 341
 				LOG(L_ERR, "ERROR: invalid routing table number in"
342
-							"route(%d)\n", a->p1.number);
342
+							"route(%lu)\n", a->p1.number);
343 343
 				ret=E_CFG;
344 344
 				break;
345 345
 			}
... ...
@@ -457,7 +457,7 @@ int do_action(struct action* a, struct sip_msg* msg)
457 457
 				} else if (a->type==STRIP_T) {
458 458
 					if (a->p1.number>uri.user.len) {
459 459
 						LOG(L_WARN, "Error: too long strip asked; "
460
-									" deleting username: %d of <%.*s>\n",
460
+									" deleting username: %lu of <%.*s>\n",
461 461
 									a->p1.number, uri.user.len, uri.user.s );
462 462
 						len=0;
463 463
 					} else if (a->p1.number==uri.user.len) {
... ...
@@ -469,7 +469,7 @@ int do_action(struct action* a, struct sip_msg* msg)
469 469
 				} else if (a->type==STRIP_TAIL_T) {
470 470
 					if (a->p1.number>uri.user.len) {
471 471
 						LOG(L_WARN, "WARNING: too long strip_tail asked; "
472
-									" deleting username: %d of <%.*s>\n",
472
+									" deleting username: %lu of <%.*s>\n",
473 473
 									a->p1.number, uri.user.len, uri.user.s );
474 474
 						len=0;
475 475
 					} else if (a->p1.number==uri.user.len) {
... ...
@@ -39,7 +39,7 @@
39 39
 typedef struct {
40 40
 	char* table;           /* Default table to use */
41 41
 	int connected;         /* 1 if database is connected */
42
-	unsigned char tail[1]; /* Variable length tail
42
+	unsigned long tail[1]; /* Variable length tail
43 43
 				* database module specific */    
44 44
 } db_con_t;
45 45
 
... ...
@@ -23,7 +23,7 @@ typedef unsigned char *POINTER;
23 23
 typedef unsigned short int UINT2;
24 24
 
25 25
 /* UINT4 defines a four byte word */
26
-typedef unsigned long int UINT4;
26
+typedef unsigned int UINT4;
27 27
 
28 28
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
29 29
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
... ...
@@ -325,7 +325,7 @@ void print_action(struct action* a)
325 325
 					DBG("\"%s\"", t->p1.string);
326 326
 					break;
327 327
 			case NUMBER_ST:
328
-					DBG("%d",t->p1.number);
328
+					DBG("%lu",t->p1.number);
329 329
 					break;
330 330
 			case IP_ST:
331 331
 					print_ip((struct ip_addr*)t->p1.data);
... ...
@@ -350,7 +350,7 @@ void print_action(struct action* a)
350 350
 					DBG(", \"%s\"", t->p2.string);
351 351
 					break;
352 352
 			case NUMBER_ST:
353
-					DBG(", %d",t->p2.number);
353
+					DBG(", %lu",t->p2.number);
354 354
 					break;
355 355
 			case EXPR_ST:
356 356
 					print_expr((struct expr*)t->p2.data);
... ...
@@ -369,7 +369,7 @@ void print_action(struct action* a)
369 369
 					DBG(", \"%s\"", t->p3.string);
370 370
 					break;
371 371
 			case NUMBER_ST:
372
-					DBG(", %d",t->p3.number);
372
+					DBG(", %lu",t->p3.number);
373 373
 					break;
374 374
 			case EXPR_ST:
375 375
 					print_expr((struct expr*)t->p3.data);
... ...
@@ -94,7 +94,7 @@ struct action{
94 94
 	int p2_type;
95 95
 	int p3_type;
96 96
 	union {
97
-		int number;
97
+		long number;
98 98
 		char* string;
99 99
 		void* data;
100 100
 	}p1, p2, p3;