- fixed all the warnings in core

(now it compiles cleanly on linux/i386, solaris/sparc64, netbsd/sparc64, freebsd/i386, openbsd/i386).

Makefile.defs

@@ -536,7 +536,8 @@ ifeq ($(OS), freebsd)
 endif
 
 ifeq ($(OS), openbsd)
-	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DDLSYM_PREFIX='"_"' -DHAVE_GETHOSTBYNAME2 
+	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DDLSYM_PREFIX='"_"' -DHAVE_GETHOSTBYNAME2 \
+		-DHAVE_UNION_SEMUN
 	# (symbols on openbsd are prefixed by "_")
 	YACC=yacc
 	# no sched_yield on openbsd unless linking with c_r (not recommended)

cfg.y

@@ -48,8 +48,8 @@ struct id_list* lst_tmp;
 %}
 
 %union {
-	int intval;
-	unsigned uval;
+	long intval;
+	unsigned long uval;
 	char* strval;
 	struct expr* expr;
 	struct action* action;

fifo_server.c

@@ -479,7 +479,7 @@ int open_fifo_server()
 	t=ctime(&up_since);
 	if (strlen(t)+1>=MAX_CTIME_LEN) {
 		LOG(L_ERR, "ERROR: open_fifo_server: "
-			"too long date %d\n", strlen(t));
+			"too long date %d\n", (int)strlen(t));
 		return -1;
 	}
 	memcpy(up_since_ctime,t,strlen(t)+1);

flags.h

@@ -35,7 +35,7 @@ enum { FL_WHITE=1, FL_YELLOW, FL_GREEN, FL_RED, FL_BLUE, FL_MAGENTA,
 
 typedef unsigned int flag_t;
 
-#define MAX_FLAG  ( sizeof(flag_t) * CHAR_BIT - 1 )
+#define MAX_FLAG  ((unsigned int)( sizeof(flag_t) * CHAR_BIT - 1 ))
 
 struct sip_msg;
 

mem/f_malloc.c

@@ -116,7 +116,7 @@ struct fm_block* fm_malloc_init(char* address, unsigned int size)
 	unsigned int init_overhead;
 	
 	/* make address and size multiple of 8*/
-	start=(char*)ROUNDUP((unsigned int) address);
+	start=(char*)ROUNDUP((unsigned long) address);
 	if (size<start-address) return 0;
 	size-=(start-address);
 	if (size <(MIN_FRAG_SIZE+FRAG_OVERHEAD)) return 0;
@@ -285,12 +285,12 @@ void fm_status(struct fm_block* qm)
 	struct fm_frag* f;
 	int i,j;
 	int h;
-	int size;
+	long size;
 
 	LOG(memlog, "fm_status (%p):\n", qm);
 	if (!qm) return;
 
-	LOG(memlog, " heap size= %d\n", qm->size);
+	LOG(memlog, " heap size= %ld\n", qm->size);
 #ifdef DBG_F_MALLOC
 	LOG(memlog, " used= %d, used+overhead=%d, free=%d\n",
 			qm->used, qm->real_used, qm->size-qm->real_used);
@@ -314,7 +314,7 @@ void fm_status(struct fm_block* qm)
 		
 		for (f=qm->free_hash[h],j=0; f; size+=f->size,f=f->u.nxt_free,i++,j++);
 		if (j) LOG(memlog, "hash = %3d fragments no.: %5d,\n\t\t"
-							" bucket size: %9d - %9d (first %9d)\n",
+							" bucket size: %9d - %9d (first %9ld)\n",
 							h, j, UN_HASH(h),
 							((h<F_MALLOC_OPTIMIZE/ROUNDTO)?1:2)*UN_HASH(h),
 							qm->free_hash[h]->size
@@ -332,7 +332,7 @@ void fm_status(struct fm_block* qm)
 		}
 	*/
 	}
-	LOG(memlog, "TOTAL: %6d free fragments = %6d free bytes\n", i, size);
+	LOG(memlog, "TOTAL: %6d free fragments = %6ld free bytes\n", i, size);
 	LOG(memlog, "-----------------------------\n");
 }
 

mem/q_malloc.c

@@ -97,14 +97,14 @@ inline static int big_hash_idx(int s)
 static  void qm_debug_frag(struct qm_block* qm, struct qm_frag* f)
 {
 	if (f->check!=ST_CHECK_PATTERN){
-		LOG(L_CRIT, "BUG: qm_*: fragm. %p beginning overwritten(%x)!\n",
+		LOG(L_CRIT, "BUG: qm_*: fragm. %p beginning overwritten(%lx)!\n",
 				f, f->check);
 		qm_status(qm);
 		abort();
 	};
 	if ((FRAG_END(f)->check1!=END_CHECK_PATTERN1)||
 		(FRAG_END(f)->check2!=END_CHECK_PATTERN2)){
-		LOG(L_CRIT, "BUG: qm_*: fragm. %p end overwritten(%x, %x)!\n",
+		LOG(L_CRIT, "BUG: qm_*: fragm. %p end overwritten(%lx, %lx)!\n",
 				f, FRAG_END(f)->check1, FRAG_END(f)->check2);
 		qm_status(qm);
 		abort();
@@ -112,8 +112,8 @@ static  void qm_debug_frag(struct qm_block* qm, struct qm_frag* f)
 	if ((f>qm->first_frag)&&
 			((PREV_FRAG_END(f)->check1!=END_CHECK_PATTERN1) ||
 				(PREV_FRAG_END(f)->check2!=END_CHECK_PATTERN2) ) ){
-		LOG(L_CRIT, "BUG: qm_*: prev. fragm. tail overwritten(%x, %x)[%p]!\n",
-				PREV_FRAG_END(f)->check1, PREV_FRAG_END(f)->check2, f);
+		LOG(L_CRIT, "BUG: qm_*: prev. fragm. tail overwritten(%lx, %lx)[%p]!\n"
+				,PREV_FRAG_END(f)->check1, PREV_FRAG_END(f)->check2, f);
 		qm_status(qm);
 		abort();
 	}
@@ -154,10 +154,10 @@ struct qm_block* qm_malloc_init(char* address, unsigned int size)
 	
 	/* make address and size multiple of 8*/
 	start=(char*)ROUNDUP((unsigned long) address);
-	DBG("qm_malloc_init: QM_OPTIMIZE=%d, /ROUNDTO=%d\n",
+	DBG("qm_malloc_init: QM_OPTIMIZE=%ld, /ROUNDTO=%ld\n",
 			QM_MALLOC_OPTIMIZE, QM_MALLOC_OPTIMIZE/ROUNDTO);
-	DBG("qm_malloc_init: QM_HASH_SIZE=%d, qm_block size=%d\n",
-			QM_HASH_SIZE, sizeof(struct qm_block));
+	DBG("qm_malloc_init: QM_HASH_SIZE=%ld, qm_block size=%d\n",
+			QM_HASH_SIZE, (int)sizeof(struct qm_block));
 	DBG("qm_malloc_init(%p, %d), start=%p\n", address, size, start);
 	if (size<start-address) return 0;
 	size-=(start-address);
@@ -166,7 +166,7 @@ struct qm_block* qm_malloc_init(char* address, unsigned int size)
 	
 	init_overhead=ROUNDUP(sizeof(struct qm_block))+sizeof(struct qm_frag)+
 		sizeof(struct qm_frag_end);
-	DBG("qm_malloc_init: size= %d, init_overhead=%d\n", size, init_overhead);
+	DBG("qm_malloc_init: size= %d, init_overhead=%ld\n", size, init_overhead);
 	
 	if (size < init_overhead)
 	{
@@ -339,7 +339,7 @@ void qm_free(struct qm_block* qm, void* p)
 	struct qm_frag* f;
 	struct qm_frag* prev;
 	struct qm_frag* next;
-	unsigned int size;
+	unsigned long size;
 
 #ifdef DBG_QM_MALLOC
 	DBG("qm_free(%p, %p), called from %s: %s(%d)\n", qm, p, file, func, line);
@@ -359,11 +359,11 @@ void qm_free(struct qm_block* qm, void* p)
 	qm_debug_frag(qm, f);
 	if (f->u.is_free){
 		LOG(L_CRIT, "BUG: qm_free: freeing already freed pointer,"
-				" first free: %s: %s(%d) - aborting\n",
+				" first free: %s: %s(%ld) - aborting\n",
 				f->file, f->func, f->line);
 		abort();
 	}
-	DBG("qm_free: freeing block alloc'ed from %s: %s(%d)\n", f->file, f->func,
+	DBG("qm_free: freeing block alloc'ed from %s: %s(%ld)\n", f->file, f->func,
 			f->line);
 #endif
 	size=f->size;
@@ -420,22 +420,22 @@ void qm_status(struct qm_block* qm)
 	LOG(memlog, "qm_status (%p):\n", qm);
 	if (!qm) return;
 
-	LOG(memlog, " heap size= %d\n", qm->size);
-	LOG(memlog, " used= %d, used+overhead=%d, free=%d\n",
+	LOG(memlog, " heap size= %ld\n", qm->size);
+	LOG(memlog, " used= %ld, used+overhead=%ld, free=%ld\n",
 			qm->used, qm->real_used, qm->size-qm->real_used);
-	LOG(memlog, " max used (+overhead)= %d\n", qm->max_real_used);
+	LOG(memlog, " max used (+overhead)= %ld\n", qm->max_real_used);
 	
 	LOG(memlog, "dumping all allocked. fragments:\n");
 	for (f=qm->first_frag, i=0;(char*)f<(char*)qm->last_frag_end;f=FRAG_NEXT(f)
 			,i++){
 		if (! f->u.is_free){
-			LOG(memlog, "    %3d. %c  address=%p  size=%d\n", i, 
+			LOG(memlog, "    %3d. %c  address=%p  size=%ld\n", i, 
 				(f->u.is_free)?'a':'N',
 				(char*)f+sizeof(struct qm_frag), f->size);
 #ifdef DBG_QM_MALLOC
-			LOG(memlog, "            %s from %s: %s(%d)\n",
+			LOG(memlog, "            %s from %s: %s(%ld)\n",
 				(f->u.is_free)?"freed":"alloc'd", f->file, f->func, f->line);
-			LOG(memlog, "        start check=%x, end check= %x, %x\n",
+			LOG(memlog, "        start check=%lx, end check= %lx, %lx\n",
 				f->check, FRAG_END(f)->check1, FRAG_END(f)->check2);
 #endif
 		}

mem/q_malloc.h

@@ -46,13 +46,13 @@
 
 
 #define QM_MALLOC_OPTIMIZE_FACTOR 11 /*used below */
-#define QM_MALLOC_OPTIMIZE  (1<<QM_MALLOC_OPTIMIZE_FACTOR)
+#define QM_MALLOC_OPTIMIZE  ((unsigned long)(1<<QM_MALLOC_OPTIMIZE_FACTOR))
 								/* size to optimize for,
 									(most allocs < this size),
 									must be 2^k */
 
-#define QM_HASH_SIZE (QM_MALLOC_OPTIMIZE/ROUNDTO + \
-		(32-QM_MALLOC_OPTIMIZE_FACTOR)+1)
+#define QM_HASH_SIZE ((unsigned long)(QM_MALLOC_OPTIMIZE/ROUNDTO + \
+		(32-QM_MALLOC_OPTIMIZE_FACTOR)+1))
 
 /* hash structure:
  * 0 .... QM_MALLOC_OPTIMIE/ROUNDTO  - small buckets, size increases with

modparam.c

@@ -58,7 +58,7 @@ int set_mod_param(char* _mod, char* _name, modparam_t _type, void* _val)
 		break;
 
 	case INT_PARAM:
-		*((int*)ptr) = (int)_val;
+		*((int*)ptr) = (int)(long)_val;
 		break;
 	}
 

parser/parse_to.c

@@ -149,7 +149,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 				}
 				break;
 			case '\r':
@@ -187,7 +187,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -206,7 +206,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -231,7 +231,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param :"
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status,(int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -251,7 +251,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 						else {
 							LOG( L_ERR , "ERROR: parse_to_param : unexpected "
 								"char [%c] in status %d: <<%.*s>> .\n",
-								*tmp,status, tmp-buffer, buffer);
+								*tmp,status, (int)(tmp-buffer), buffer);
 							goto error;
 						}
 #endif
@@ -280,7 +280,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param :"
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -313,7 +313,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param :"
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -348,7 +348,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -383,7 +383,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -412,7 +412,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 					default:
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -526,7 +526,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 				}
 				break;
 			case '\r':
@@ -550,7 +550,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -569,7 +569,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -596,7 +596,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -620,7 +620,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -642,7 +642,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;
@@ -669,7 +669,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 					default:
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
-							*tmp,status, tmp-buffer, buffer);
+							*tmp,status, (int)(tmp-buffer), buffer);
 						goto error;
 				}
 				break;

parser/parse_via.c

@@ -1794,11 +1794,11 @@ nextvia:
 
 error:
 	if (end>buffer){
-		LOG(L_ERR, "ERROR: parse_via on: <%.*s>\n", end-buffer, buffer);
+		LOG(L_ERR, "ERROR: parse_via on: <%.*s>\n", (int)(end-buffer), buffer);
 	}
 	if ((tmp>buffer)&&(tmp<end)){
 		LOG(L_ERR, "ERROR: parse_via parse error, parsed so far:<%.*s>\n",
-				tmp-buffer, buffer );
+				(int)(tmp-buffer), buffer );
 	}else{
 		LOG(L_ERR, "ERROR: parse_via: via parse error\n");
 	}