Fix up NetBSD/alpha build.

6 files changed, 14 insertions, 14 deletions

diff --git a/common/bpf.c b/common/bpf.c
index 3a65ffa3..c7809f25 100644
--- a/common/bpf.c
+++ b/common/bpf.c
@@ -47,7 +47,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bpf.c,v 1.45 2000/12/28 23:13:07 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bpf.c,v 1.46 2001/02/26 22:21:05 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -282,8 +282,8 @@ void if_register_receive (info)
 		log_fatal ("Can't get bpf buffer length: %m");
 	info -> rbuf = dmalloc (info -> rbuf_max, MDL);
 	if (!info -> rbuf)
-		log_fatal ("Can't allocate %d bytes for bpf input buffer.",
-			   info -> rbuf_max);
+		log_fatal ("Can't allocate %ld bytes for bpf input buffer.",
+			   (long)(info -> rbuf_max));
 	info -> rbuf_offset = 0;
 	info -> rbuf_len = 0;
 
diff --git a/common/comapi.c b/common/comapi.c
index 405769ba..1e5e98a1 100644
--- a/common/comapi.c
+++ b/common/comapi.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: comapi.c,v 1.7 2000/12/28 23:14:05 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: comapi.c,v 1.8 2001/02/26 22:21:06 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -267,7 +267,7 @@ isc_result_t dhcp_group_signal_handler (omapi_object_t *h,
 		if (!group -> name) {
 			char hnbuf [64];
 			sprintf (hnbuf, "ng%08lx%08lx",
-				 cur_time, (unsigned long)group);
+				 (unsigned long)cur_time, (unsigned long)group);
 			group -> name = dmalloc (strlen (hnbuf) + 1, MDL);
 			if (!group -> name)
 				return ISC_R_NOMEMORY;
diff --git a/common/ctrace.c b/common/ctrace.c
index 60988a64..bea933cb 100644
--- a/common/ctrace.c
+++ b/common/ctrace.c
@@ -68,8 +68,8 @@ void trace_interface_input (trace_type_t *ttype, unsigned len, char *buf)
 	isc_result_t status;
 
 	if (len != sizeof *tipkt) {
-		log_error ("trace interface packet size mismatch: %d != %d",
-			   sizeof *tipkt, len);
+		log_error ("trace interface packet size mismatch: %ld != %d",
+			   (long)(sizeof *tipkt), len);
 		return;
 	}
 	tipkt = (trace_interface_packet_t *)buf;
diff --git a/common/icmp.c b/common/icmp.c
index a5811c5d..d1376f7a 100644
--- a/common/icmp.c
+++ b/common/icmp.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: icmp.c,v 1.27 2001/02/17 21:34:50 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: icmp.c,v 1.28 2001/02/26 22:21:08 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -311,7 +311,7 @@ void trace_icmp_output_input (trace_type_t *ttype, unsigned length, char *buf)
 
 	if (length != (sizeof (*icmp) + (sizeof *ia))) {
 		log_error ("trace_icmp_output_input: data size mismatch %d:%d",
-			   length, (sizeof (*icmp) + (sizeof *ia)));
+			   length, (int)((sizeof (*icmp)) + (sizeof *ia)));
 		return;
 	}
 	ia = (struct iaddr *)buf;
diff --git a/common/packet.c b/common/packet.c
index a34aae19..cafe26e3 100644
--- a/common/packet.c
+++ b/common/packet.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: packet.c,v 1.39 2000/10/15 18:54:29 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: packet.c,v 1.40 2001/02/26 22:21:10 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -305,8 +305,8 @@ ssize_t decode_udp_ip_header (interface, buf, bufix, from, data, buflen)
 	  if (len + data < buf + bufix + buflen)
 		  log_debug ("accepting packet with data after udp payload.");
 	  if (len + data > buf + bufix + buflen) {
-		  log_debug ("dropping packet with bogus uh_ulen %d",
-			     len + sizeof *udp);
+		  log_debug ("dropping packet with bogus uh_ulen %ld",
+			     (long)(len + sizeof *udp));
 		  return -1;
 	  }
   }
diff --git a/common/tree.c b/common/tree.c
index 25b2abe2..f0464fe0 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.98 2001/01/25 08:24:33 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.99 2001/02/26 22:21:11 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -2220,7 +2220,7 @@ int evaluate_numeric_expression (result, packet, lease, client_state,
 		if (lease -> ends < cur_time) {
 			log_error ("%s %lu when it is now %lu",
 				   "data: lease_time: lease ends at",
-				   lease -> ends, cur_time);
+				   (long)(lease -> ends), (long)cur_time);
 			return 0;
 		}
 		*result = lease -> ends - cur_time;