Fix printf-style formats to match argument when building on

32-bit arches.

Author: sobomax

cfg_pp.c

@@ -458,7 +458,7 @@ static int flatten_opensips_cfg(FILE *cfg, const char *cfg_path, str *out)
 
 	if (strlen(out->s) != out->len) {
 		LM_BUG("preprocessed buffer check failed (%lu vs. %d)",
-		       strlen(out->s), out->len);
+		       (unsigned long)strlen(out->s), out->len);
 		LM_ERR("either this is a bug or your script contains '\\0' chars, "
 		        "which are obviously NOT allowed!\n");
 		return -1;

db/db_val.h

@@ -108,7 +108,7 @@ static inline void db_print_val(db_val_t *v)
 			LM_GEN1(L_DBG, "\t'%.*s'\n", v->val.str_val.len, v->val.str_val.s);
 			break;
 		case DB_DATETIME:
-			LM_GEN1(L_DBG, "\t'%ld'\n", v->val.time_val);
+			LM_GEN1(L_DBG, "\t'%ld'\n", (long)v->val.time_val);
 			break;
 		case DB_BLOB:
 			LM_GEN1(L_DBG, "\t'%.*s'\n", v->val.blob_val.len, v->val.blob_val.s);

mem/rpm_mem.c

@@ -507,7 +507,7 @@ int init_rpm_mallocs(void)
 		if (fst.st_size != rpm_mem_size) {
 			LM_WARN("restart persistency cache (%s) size %ld is different than "
 					"the size we are running with %ld: creating a new cache!\n",
-					rpm_mem_file, fst.st_size, rpm_mem_size);
+					rpm_mem_file, (long)fst.st_size, rpm_mem_size);
 		} else if (load_rpm_file() == 0)
 			return 0; /* memblock loaded just fine */
 		LM_INFO("restart persistent cache is invalid: creating a new one!\n");

parser/sdp/sdp.c

@@ -403,7 +403,7 @@ int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_info_t*
 	if (*v1p == '\r' || *v1p == '\n')
 		v1p++;
 	if (v1p + 1 >= bodylimit) {
-		LM_ERR("body too short %ld!\n", bodylimit - v1p);
+		LM_ERR("body too short %ld!\n", (long)(bodylimit - v1p));
 		return -1;
 	}
 	if (*v1p != 'v' || *(v1p+1) != '=') {

reactor.c

@@ -87,7 +87,7 @@ int init_reactor_size(void)
 		if (reactor_size < lim.rlim_cur) {
 			LM_WARN("shrinking reactor size from %lu (autodetected via rlimit) "
 					"to %d (limited by memory of %d%% from %luMb)\n",
-					lim.rlim_cur, reactor_size, FD_MEM_PERCENT, mem_size/1024/1024);
+					(unsigned long)lim.rlim_cur, reactor_size, FD_MEM_PERCENT, mem_size/1024/1024);
 			LM_WARN("use 'open_files_limit' to enforce other limit or "
 					"increase %s memory\n", mem_type);
 		} else {

time_rec.c

@@ -264,9 +264,9 @@ time_t tz_adjust_ts(time_t unix_time, const str *tz)
 	if (local_tm.tm_isdst > 0)
 		adj_ts -= 3600;
 
-	LM_DBG("UNIX ts: %ld, local-adjusted ts: %ld (tz: '%.*s', DST: %s)\n", unix_time,
-	       adj_ts, tz ? tz->len : 4, tz ? tz->s : "null",
-	       local_tm.tm_isdst == 1 ? "on" :
+	LM_DBG("UNIX ts: %ld, local-adjusted ts: %ld (tz: '%.*s', DST: %s)\n",
+	       (long int)unix_time, (long int)adj_ts, tz ? tz->len : 4,
+	       tz ? tz->s : "null", local_tm.tm_isdst == 1 ? "on" :
 	       local_tm.tm_isdst == 0 ? "off" : "unavail");
 
 	return adj_ts;