From: Mark Andrews <marka@isc.org>
Date: Thu, 9 Sep 2010 06:48:52 +0000 (+0000)
Subject: address builds where sizeof != int
X-Git-Tag: v4_3_0a1~262
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=228e44472252fec51c05eaf9e878f684fb583a76;p=thirdparty%2Fdhcp.git

address builds where sizeof != int
---

diff --git a/server/dhcp.c b/server/dhcp.c
index 374671c13..9d42a7aca 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -1086,8 +1086,9 @@ void dhcpinform (packet, ms_nulltp)
 		i = d1.len;
 		if (i >= sizeof(raw.file)) {
 			log_info("file name longer than packet field "
-				 "truncated - field: %d name: %d %.*s", 
-				 sizeof(raw.file), i, i, d1.data);
+				 "truncated - field: %lu name: %d %.*s", 
+				 (unsigned long)sizeof(raw.file), i, i,
+				 d1.data);
 			i = sizeof(raw.file);
 		} else
 			raw.file[i] = 0;
@@ -1105,8 +1106,9 @@ void dhcpinform (packet, ms_nulltp)
 		i = d1.len;
 		if (i >= sizeof(raw.sname)) {
 			log_info("server name longer than packet field "
-				 "truncated - field: %d name: %d %.*s", 
-				 sizeof(raw.sname), i, i, d1.data);
+				 "truncated - field: %lu name: %d %.*s", 
+				 (unsigned long)sizeof(raw.sname), i, i,
+				 d1.data);
 			i = sizeof(raw.sname);
 		} else
 			raw.sname[i] = 0;
@@ -3018,9 +3020,10 @@ void dhcp_reply (lease)
 				(sizeof raw.file) - state -> filename.len);
 		else 
 			log_info("file name longer than packet field "
-				 "truncated - field: %d name: %d %.*s", 
-				 sizeof(raw.file), state->filename.len,
-				 state->filename.len, state->filename.data);
+				 "truncated - field: %lu name: %d %.*s", 
+				 (unsigned long)sizeof(raw.file),
+				 state->filename.len, state->filename.len,
+				 state->filename.data);
 	} else
 		bufs |= 1;
 
@@ -3036,8 +3039,9 @@ void dhcp_reply (lease)
 				(sizeof raw.sname) - state -> server_name.len);
 		else 
 			log_info("server name longer than packet field "
-				 "truncated - field: %d name: %d %.*s", 
-				 sizeof(raw.sname), state->server_name.len,
+				 "truncated - field: %lu name: %d %.*s", 
+				 (unsigned long)sizeof(raw.sname),
+				 state->server_name.len,
 				 state->server_name.len,
 				 state->server_name.data);
 	} else