Module Name: src
Committed By: lukem
Date: Mon Apr 6 12:36:27 UTC 2009
Modified Files:
src/sbin/routed: trace.c
Log Message:
fix sign-compare issue
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sbin/routed/trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/routed/trace.c
diff -u src/sbin/routed/trace.c:1.31 src/sbin/routed/trace.c:1.32
--- src/sbin/routed/trace.c:1.31 Wed Mar 22 02:23:11 2006
+++ src/sbin/routed/trace.c Mon Apr 6 12:36:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trace.c,v 1.31 2006/03/22 02:23:11 christos Exp $ */
+/* $NetBSD: trace.c,v 1.32 2009/04/06 12:36:27 lukem Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -41,7 +41,7 @@
#include <fcntl.h>
#ifdef __NetBSD__
-__RCSID("$NetBSD: trace.c,v 1.31 2006/03/22 02:23:11 christos Exp $");
+__RCSID("$NetBSD: trace.c,v 1.32 2009/04/06 12:36:27 lukem Exp $");
#elif defined(__FreeBSD__)
__RCSID("$FreeBSD$");
#else
@@ -601,7 +601,7 @@
int i;
i = snprintf(buf, sizeof(buf), "%-16s-->", addrname(dst, mask, 0));
- if (i >= sizeof(buf) || i < 0)
+ if (i < 0 || (size_t)i >= sizeof(buf))
return buf;
(void)snprintf(&buf[i], sizeof(buf) - i, "%-*s", 15+20-MAX(20, i),
naddr_ntoa(gate));
