delint

ok otto@

3 files changed, 14 insertions, 12 deletions

diff --git a/lib/libwrap/fix_options.c b/lib/libwrap/fix_options.c
index 4dfc630d657..b1aec1a6301 100644
--- a/lib/libwrap/fix_options.c
+++ b/lib/libwrap/fix_options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fix_options.c,v 1.6 2003/04/19 18:31:48 avsm Exp $	*/
+/*	$OpenBSD: fix_options.c,v 1.7 2006/04/14 18:27:49 dhill Exp $	*/
 
  /*
   * Routine to disable IP-level socket options. This code was taken from 4.4BSD
@@ -11,7 +11,7 @@
 #if 0
 static char sccsid[] = "@(#) fix_options.c 1.4 97/02/12 02:13:22";
 #else
-static char rcsid[] = "$OpenBSD: fix_options.c,v 1.6 2003/04/19 18:31:48 avsm Exp $";
+static char rcsid[] = "$OpenBSD: fix_options.c,v 1.7 2006/04/14 18:27:49 dhill Exp $";
 #endif
 #endif
 
@@ -44,13 +44,14 @@ struct request_info *request;
 #ifdef IP_OPTIONS
     struct ipoption optbuf;
     char    lbuf[BUFFER_SIZE], *lp, *cp;
-    int     optsize = sizeof(optbuf), ipproto;
+    int     ipproto;
+    socklen_t optsize = sizeof(optbuf);
     size_t  lps;
     struct protoent *ip;
     int     fd = request->fd;
     int     i;
     struct sockaddr_storage ss;
-    int sslen;
+    socklen_t sslen;
 
     /*
      * check if this is AF_INET socket
diff --git a/lib/libwrap/rfc931.c b/lib/libwrap/rfc931.c
index a90cbce5e83..b72b1a872b9 100644
--- a/lib/libwrap/rfc931.c
+++ b/lib/libwrap/rfc931.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfc931.c,v 1.10 2005/11/10 18:44:54 otto Exp $	*/
+/*	$OpenBSD: rfc931.c,v 1.11 2006/04/14 18:27:49 dhill Exp $	*/
 
 /* rfc1413 does an attempt at an ident query to a client. Originally written
  * by Wietse Venema, rewritten by Bob Beck <beck@openbsd.org> to avoid 
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rfc931.c,v 1.10 2005/11/10 18:44:54 otto Exp $";
+static char rcsid[] = "$OpenBSD: rfc931.c,v 1.11 2006/04/14 18:27:49 dhill Exp $";
 #endif
 
 #include <stdio.h>
@@ -31,6 +31,7 @@ static volatile sig_atomic_t ident_timeout;
 
 int rfc931_timeout = RFC931_TIMEOUT; /* global, legacy from tcpwrapper stuff */
 
+/*ARGSUSED*/
 static void
 timeout(s)
 	int s;
diff --git a/lib/libwrap/socket.c b/lib/libwrap/socket.c
index f0ae015ca9e..5816855e108 100644
--- a/lib/libwrap/socket.c
+++ b/lib/libwrap/socket.c
@@ -21,7 +21,7 @@
 #if 0
 static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24";
 #else
-static char rcsid[] = "$OpenBSD: socket.c,v 1.7 2003/12/27 22:58:35 henning Exp $";
+static char rcsid[] = "$OpenBSD: socket.c,v 1.8 2006/04/14 18:27:49 dhill Exp $";
 #endif
 #endif
 
@@ -81,9 +81,9 @@ struct request_info *request;
 {
     static struct sockaddr_storage client;
     static struct sockaddr_storage server;
-    int     len;
-    char    buf[BUFSIZ];
-    int     fd = request->fd;
+    socklen_t   len;
+    char        buf[BUFSIZ];
+    int         fd = request->fd;
 
     sock_methods(request);
 
@@ -273,9 +273,9 @@ struct host_info *host;
 static void sock_sink(fd)
 int     fd;
 {
-    char    buf[BUFSIZ];
+    char    	buf[BUFSIZ];
     struct sockaddr_storage ss;
-    int     size = sizeof(ss);
+    socklen_t	size = sizeof(ss);
 
     /*
      * Eat up the not-yet received datagram. Some systems insist on a