From: Ted Lemon <source@isc.org>
Date: Sun, 8 Jun 1997 03:18:09 +0000 (+0000)
Subject: size_t -> ssize_t in return values where < 0 == error
X-Git-Tag: DHCP-970607~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4595a58c251248b3f001ec729b6c0747ea0b73d6;p=thirdparty%2Fdhcp.git

size_t -> ssize_t in return values where < 0 == error
---

diff --git a/common/bpf.c b/common/bpf.c
index d223a9f84..2f44dc3a5 100644
--- a/common/bpf.c
+++ b/common/bpf.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bpf.c,v 1.17 1997/02/26 05:20:52 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bpf.c,v 1.18 1997/06/08 03:18:07 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -240,7 +240,7 @@ void if_register_receive (info)
 #endif /* USE_BPF_RECEIVE */
 
 #ifdef USE_BPF_SEND
-size_t send_packet (interface, packet, raw, len, from, to, hto)
+ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	struct interface_info *interface;
 	struct packet *packet;
 	struct dhcp_packet *raw;
@@ -270,7 +270,7 @@ size_t send_packet (interface, packet, raw, len, from, to, hto)
 #endif /* USE_BPF_SEND */
 
 #ifdef USE_BPF_RECEIVE
-size_t receive_packet (interface, buf, len, from, hfrom)
+ssize_t receive_packet (interface, buf, len, from, hfrom)
 	struct interface_info *interface;
 	unsigned char *buf;
 	size_t len;
diff --git a/common/nit.c b/common/nit.c
index 4c84f8bab..20ffacd62 100644
--- a/common/nit.c
+++ b/common/nit.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: nit.c,v 1.13 1997/02/26 05:20:53 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: nit.c,v 1.14 1997/06/08 03:18:07 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -246,7 +246,7 @@ void if_register_receive (info)
 #endif /* USE_NIT_RECEIVE */
 
 #ifdef USE_NIT_SEND
-size_t send_packet (interface, packet, raw, len, from, to, hto)
+ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	struct interface_info *interface;
 	struct packet *packet;
 	struct dhcp_packet *raw;
@@ -297,7 +297,7 @@ size_t send_packet (interface, packet, raw, len, from, to, hto)
 #endif /* USE_NIT_SEND */
 
 #ifdef USE_NIT_RECEIVE
-size_t receive_packet (interface, buf, len, from, hfrom)
+ssize_t receive_packet (interface, buf, len, from, hfrom)
 	struct interface_info *interface;
 	unsigned char *buf;
 	size_t len;
diff --git a/common/print.c b/common/print.c
index f9b814f3a..24da045b3 100644
--- a/common/print.c
+++ b/common/print.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: print.c,v 1.14 1997/06/02 22:32:37 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: print.c,v 1.15 1997/06/08 03:18:08 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -61,7 +61,7 @@ char *print_hw_addr (htype, hlen, data)
 	} else {
 		s = habuf;
 		for (i = 0; i < hlen; i++) {
-			sprintf (s, "%x", data [i]);
+			sprintf (s, "%2.2x", data [i]);
 			s += strlen (s);
 			*s++ = ':';
 		}
diff --git a/common/socket.c b/common/socket.c
index bd9b49a54..a68a502ce 100644
--- a/common/socket.c
+++ b/common/socket.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: socket.c,v 1.24 1997/03/29 03:19:02 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: socket.c,v 1.25 1997/06/08 03:18:08 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -184,7 +184,7 @@ void if_register_receive (info)
 #endif /* USE_SOCKET_RECEIVE */
 
 #ifdef USE_SOCKET_SEND
-size_t send_packet (interface, packet, raw, len, from, to, hto)
+ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	struct interface_info *interface;
 	struct packet *packet;
 	struct dhcp_packet *raw;
@@ -212,7 +212,7 @@ size_t send_packet (interface, packet, raw, len, from, to, hto)
 #endif /* USE_SOCKET_SEND */
 
 #ifdef USE_SOCKET_RECEIVE
-size_t receive_packet (interface, buf, len, from, hfrom)
+ssize_t receive_packet (interface, buf, len, from, hfrom)
 	struct interface_info *interface;
 	unsigned char *buf;
 	size_t len;
diff --git a/common/upf.c b/common/upf.c
index dd666aa39..d5e27cc57 100644
--- a/common/upf.c
+++ b/common/upf.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: upf.c,v 1.1 1997/03/05 06:09:04 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: upf.c,v 1.2 1997/06/08 03:18:09 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -217,7 +217,7 @@ void if_register_receive (info)
 #endif /* USE_UPF_RECEIVE */
 
 #ifdef USE_UPF_SEND
-size_t send_packet (interface, packet, raw, len, from, to, hto)
+ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	struct interface_info *interface;
 	struct packet *packet;
 	struct dhcp_packet *raw;
@@ -247,7 +247,7 @@ size_t send_packet (interface, packet, raw, len, from, to, hto)
 #endif /* USE_UPF_SEND */
 
 #ifdef USE_UPF_RECEIVE
-size_t receive_packet (interface, buf, len, from, hfrom)
+ssize_t receive_packet (interface, buf, len, from, hfrom)
 	struct interface_info *interface;
 	unsigned char *buf;
 	size_t len;
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index fd964fb75..ad84130c2 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -637,27 +637,27 @@ int if_register_socket PROTO ((struct interface_info *));
 #ifdef USE_SOCKET_FALLBACK
 void if_reinitialize_fallback PROTO ((struct interface_info *));
 void if_register_fallback PROTO ((struct interface_info *));
-size_t send_fallback PROTO ((struct interface_info *,
-			   struct packet *, struct dhcp_packet *, size_t, 
-			   struct in_addr,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t send_fallback PROTO ((struct interface_info *,
+			      struct packet *, struct dhcp_packet *, size_t, 
+			      struct in_addr,
+			      struct sockaddr_in *, struct hardware *));
 void fallback_discard PROTO ((struct protocol *));
 #endif
 
 #ifdef USE_SOCKET_SEND
 void if_reinitialize_send PROTO ((struct interface_info *));
 void if_register_send PROTO ((struct interface_info *));
-size_t send_packet PROTO ((struct interface_info *,
-			   struct packet *, struct dhcp_packet *, size_t, 
-			   struct in_addr,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t send_packet PROTO ((struct interface_info *,
+			    struct packet *, struct dhcp_packet *, size_t, 
+			    struct in_addr,
+			    struct sockaddr_in *, struct hardware *));
 #endif
 #ifdef USE_SOCKET_RECEIVE
 void if_reinitialize_receive PROTO ((struct interface_info *));
 void if_register_receive PROTO ((struct interface_info *));
-size_t receive_packet PROTO ((struct interface_info *,
-			   unsigned char *, size_t,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t receive_packet PROTO ((struct interface_info *,
+			       unsigned char *, size_t,
+			       struct sockaddr_in *, struct hardware *));
 #endif
 #if defined (USE_SOCKET_SEND) && !defined (USE_SOCKET_FALLBACK)
 void if_enable PROTO ((struct interface_info *));
@@ -670,17 +670,17 @@ int if_register_bpf PROTO ( (struct interface_info *));
 #ifdef USE_BPF_SEND
 void if_reinitialize_send PROTO ((struct interface_info *));
 void if_register_send PROTO ((struct interface_info *));
-size_t send_packet PROTO ((struct interface_info *,
-			   struct packet *, struct dhcp_packet *, size_t,
-			   struct in_addr,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t send_packet PROTO ((struct interface_info *,
+			    struct packet *, struct dhcp_packet *, size_t,
+			    struct in_addr,
+			    struct sockaddr_in *, struct hardware *));
 #endif
 #ifdef USE_BPF_RECEIVE
 void if_reinitialize_receive PROTO ((struct interface_info *));
 void if_register_receive PROTO ((struct interface_info *));
-size_t receive_packet PROTO ((struct interface_info *,
-			   unsigned char *, size_t,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t receive_packet PROTO ((struct interface_info *,
+			       unsigned char *, size_t,
+			       struct sockaddr_in *, struct hardware *));
 #endif
 #if defined (USE_BPF_SEND)
 void if_enable PROTO ((struct interface_info *));
@@ -694,17 +694,17 @@ int if_register_nit PROTO ( (struct interface_info *));
 #ifdef USE_NIT_SEND
 void if_reinitialize_send PROTO ((struct interface_info *));
 void if_register_send PROTO ((struct interface_info *));
-size_t send_packet PROTO ((struct interface_info *,
-			   struct packet *, struct dhcp_packet *, size_t,
-			   struct in_addr,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t send_packet PROTO ((struct interface_info *,
+			    struct packet *, struct dhcp_packet *, size_t,
+			    struct in_addr,
+			    struct sockaddr_in *, struct hardware *));
 #endif
 #ifdef USE_NIT_RECEIVE
 void if_reinitialize_receive PROTO ((struct interface_info *));
 void if_register_receive PROTO ((struct interface_info *));
-size_t receive_packet PROTO ((struct interface_info *,
-			   unsigned char *, size_t,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t receive_packet PROTO ((struct interface_info *,
+			       unsigned char *, size_t,
+			       struct sockaddr_in *, struct hardware *));
 #endif
 #if defined (USE_BPF_SEND)
 void if_enable PROTO ((struct interface_info *));
@@ -714,10 +714,10 @@ void if_enable PROTO ((struct interface_info *));
 #ifdef USE_RAW_SEND
 void if_reinitialize_send PROTO ((struct interface_info *));
 void if_register_send PROTO ((struct interface_info *));
-size_t send_packet PROTO ((struct interface_info *,
-			   struct packet *, struct dhcp_packet *, size_t,
-			   struct in_addr,
-			   struct sockaddr_in *, struct hardware *));
+ssize_t send_packet PROTO ((struct interface_info *,
+			    struct packet *, struct dhcp_packet *, size_t,
+			    struct in_addr,
+			    struct sockaddr_in *, struct hardware *));
 #endif
 
 /* dispatch.c */
@@ -830,11 +830,11 @@ void assemble_hw_header PROTO ((struct interface_info *, unsigned char *,
 void assemble_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
 				    int *, u_int32_t, u_int32_t, u_int16_t,
 				    unsigned char *, int));
-size_t decode_hw_header PROTO ((struct interface_info *, unsigned char *,
-				int, struct hardware *));
-size_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
-				    int, struct sockaddr_in *,
-				    unsigned char *, int));
+ssize_t decode_hw_header PROTO ((struct interface_info *, unsigned char *,
+				 int, struct hardware *));
+ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
+				     int, struct sockaddr_in *,
+				     unsigned char *, int));
 
 /* dhxpxlt.c */
 void convert_statement PROTO ((FILE *));