===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/route.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- src/usr.bin/netstat/route.c	2002/05/27 01:50:36	1.46
+++ src/usr.bin/netstat/route.c	2002/07/25 03:58:56	1.47
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.46 2002/05/27 01:50:36 deraadt Exp $	*/
+/*	$OpenBSD: route.c,v 1.47 2002/07/25 03:58:56 deraadt Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.46 2002/05/27 01:50:36 deraadt Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.47 2002/07/25 03:58:56 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -507,7 +507,7 @@
 				    workbuf + sizeof (workbuf) - cp,
 				    "%s%x", cplim, *lla);
 				cplim = ":";
-				if (n == -1)	/* What else to do ? */
+				if (n < 0)	/* What else to do ? */
 					continue;
 				if (n >= workbuf + sizeof (workbuf) - cp)
 					n = workbuf + sizeof (workbuf) - cp - 1;
@@ -535,23 +535,22 @@
 
 		slim = sa->sa_len + (u_char *) sa;
 		cplim = cp + sizeof(workbuf) - 6;
-		n = snprintf(cp, cplim - cp, "(%d)", sa->sa_family);
-		if (n >= cplim - cp)
+		if ((n = snprintf(cp, cplim - cp, "(%d)", sa->sa_family)) >=
+		    cplim - cp)
 			n = cplim - cp - 1;
 		if (n > 0)
 			cp += n;
 		while (s < slim && cp < cplim) {
-			n = snprintf(cp, workbuf + sizeof (workbuf) - cp,
-			    " %02x", *s++);
-			if (n >= workbuf + sizeof (workbuf) - cp)
+			if ((n = snprintf(cp, workbuf + sizeof (workbuf) - cp,
+			    " %02x", *s++)) >= workbuf + sizeof (workbuf) - cp)
 				n = workbuf + sizeof (workbuf) - cp - 1;
 			if (n > 0)
 				cp += n;
 			if (s < slim) {
-				n = snprintf(cp,
+				if ((n = snprintf(cp,
 				    workbuf + sizeof (workbuf) - cp,
-				    "%02x", *s++);
-				if (n >= workbuf + sizeof (workbuf) - cp)
+				    "%02x", *s++)) >=
+				    workbuf + sizeof (workbuf) - cp)
 					n = workbuf + sizeof (workbuf) - cp - 1;
 				if (n > 0)
 					cp += n;