]> git.ipfire.org Git - thirdparty/dhcp.git/commitdiff
address builds where sizeof != int
authorMark Andrews <marka@isc.org>
Thu, 9 Sep 2010 06:48:52 +0000 (06:48 +0000)
committerMark Andrews <marka@isc.org>
Thu, 9 Sep 2010 06:48:52 +0000 (06:48 +0000)
server/dhcp.c

index 374671c13145cf5a4d889e10268a687c98139ac4..9d42a7aca0b35b39970d007bc0f5293506914d60 100644 (file)
@@ -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