Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/getcap.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/gen/getcap.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.16
retrieving revision 1.18
diff -u -p -r1.16 -r1.18
--- src/lib/libc/gen/getcap.c	1998/02/03 18:23:43	1.16
+++ src/lib/libc/gen/getcap.c	1998/03/02 23:39:49	1.18
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcap.c,v 1.16 1998/02/03 18:23:43 perry Exp $	*/
+/*	$NetBSD: getcap.c,v 1.18 1998/03/02 23:39:49 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
 #else
-__RCSID("$NetBSD: getcap.c,v 1.16 1998/02/03 18:23:43 perry Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.18 1998/03/02 23:39:49 thorpej Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -85,7 +85,7 @@ static char	*toprec;	/* Additional recor
 static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
 
 static int	cdbget __P((DB *, char **, char *));
-static int 	getent __P((char **, u_int *, char **, int, char *, int, char *));
+static int 	getent __P((char **, size_t *, char **, int, char *, int, char *));
 static int	nfcmp __P((char *, char *));
 
 /*
@@ -182,7 +182,7 @@ int
 cgetent(buf, db_array, name)
 	char **buf, **db_array, *name;
 {
-	u_int dummy;
+	size_t dummy;
 
 	return (getent(buf, &dummy, db_array, -1, name, 0, NULL));
 }
@@ -208,12 +208,13 @@ cgetent(buf, db_array, name)
 static int
 getent(cap, len, db_array, fd, name, depth, nfield)
 	char **cap, **db_array, *name, *nfield;
-	u_int *len;
+	size_t *len;
 	int fd, depth;
 {
 	DB *capdbp;
 	char *r_end, *rp = NULL, **db_p;	/* pacify gcc */
-	int myfd = 0, eof, foundit, retval, clen;
+	int myfd = 0, eof, foundit, retval;
+	size_t clen;
 	char *record, *cbuf;
 	int tc_not_resolved;
 	char pbuf[_POSIX_PATH_MAX];
@@ -409,8 +410,7 @@ getent(cap, len, db_array, fd, name, dep
 	 */
 tc_exp:	{
 		char *newicap, *s;
-		int newilen;
-		u_int ilen;
+		size_t ilen, newilen;
 		int diff, iret, tclen;
 		char *icap, *scan, *tc, *tcstart, *tcend;
 
@@ -517,7 +517,7 @@ tc_exp:	{
 			 * Insert tc'ed record into our record.
 			 */
 			s = tcstart + newilen;
-			bcopy(tcend, s, rp - tcend);
+			bcopy(tcend, s, (size_t)(rp - tcend));
 			bcopy(newicap, tcstart, newilen);
 			rp += diff;
 			free(icap);
@@ -663,9 +663,9 @@ cgetnext(bp, db_array)
 	char **db_array;
 {
 	size_t len;
-	int status, i, done;
+	int status, done;
 	char *cp, *line, *rp, *np, buf[BSIZE], nbuf[BSIZE];
-	u_int dummy;
+	size_t dummy;
 
 	if (dbp == NULL)
 		dbp = db_array;
@@ -720,7 +720,6 @@ cgetnext(bp, db_array)
 		/* 
 		 * Line points to a name line.
 		 */
-		i = 0;
 		done = 0;
 		np = nbuf;
 		for (;;) {