Module Name: src
Committed By: lukem
Date: Wed Apr 15 00:13:51 UTC 2009
Modified Files:
src/usr.sbin/altq/libaltq: Makefile qop_cbq.c quip_server.c
Log Message:
Fix -Wsign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/altq/libaltq/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/altq/libaltq/qop_cbq.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/altq/libaltq/quip_server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/altq/libaltq/Makefile
diff -u src/usr.sbin/altq/libaltq/Makefile:1.9 src/usr.sbin/altq/libaltq/Makefile:1.10
--- src/usr.sbin/altq/libaltq/Makefile:1.9 Sat May 3 14:48:31 2008
+++ src/usr.sbin/altq/libaltq/Makefile Wed Apr 15 00:13:50 2009
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2009/04/15 00:13:50 lukem Exp $
LIBISPRIVATE= yes
.include <bsd.own.mk>
-#WARNS= 2
-
LIB= altq
SRCS= parser.c qop.c qop_blue.c qop_cbq.c qop_cdnr.c qop_conf.c \
qop_dummy.c qop_errlist.c qop_fifoq.c qop_hfsc.c qop_jobs.c \
Index: src/usr.sbin/altq/libaltq/qop_cbq.c
diff -u src/usr.sbin/altq/libaltq/qop_cbq.c:1.7 src/usr.sbin/altq/libaltq/qop_cbq.c:1.8
--- src/usr.sbin/altq/libaltq/qop_cbq.c:1.7 Fri May 2 19:07:44 2008
+++ src/usr.sbin/altq/libaltq/qop_cbq.c Wed Apr 15 00:13:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: qop_cbq.c,v 1.7 2008/05/02 19:07:44 xtraeme Exp $ */
+/* $NetBSD: qop_cbq.c,v 1.8 2009/04/15 00:13:51 lukem Exp $ */
/* $KAME: qop_cbq.c,v 1.7 2002/05/31 06:03:35 kjc Exp $ */
/*
* Copyright (c) Sun Microsystems, Inc. 1993-1998 All rights reserved.
@@ -421,9 +421,10 @@
struct flow_filter6 sfilt6;
u_int8_t ctl6_protos[3] = {IPPROTO_ICMPV6, IPPROTO_IGMP, IPPROTO_RSVP};
#endif
- int error, i;
+ int error;
+ size_t i;
- for (i = 0; i < (int)sizeof(ctl_protos); i++) {
+ for (i = 0; i < sizeof(ctl_protos); i++) {
memset(&sfilt, 0, sizeof(sfilt));
sfilt.ff_flow.fi_family = AF_INET;
sfilt.ff_flow.fi_proto = ctl_protos[i];
Index: src/usr.sbin/altq/libaltq/quip_server.c
diff -u src/usr.sbin/altq/libaltq/quip_server.c:1.4 src/usr.sbin/altq/libaltq/quip_server.c:1.5
--- src/usr.sbin/altq/libaltq/quip_server.c:1.4 Wed Aug 22 08:52:37 2001
+++ src/usr.sbin/altq/libaltq/quip_server.c Wed Apr 15 00:13:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: quip_server.c,v 1.4 2001/08/22 08:52:37 itojun Exp $ */
+/* $NetBSD: quip_server.c,v 1.5 2009/04/15 00:13:51 lukem Exp $ */
/* $KAME: quip_server.c,v 1.6 2001/08/20 06:41:32 kjc Exp $ */
/*
* Copyright (C) 1999-2000
@@ -154,7 +154,7 @@
return(0);
tp = strpbrk(*cpp, " \t\n#");
- L = MIN((tp)?(tp-*cpp):strlen(*cpp), 63);
+ L = MIN((tp)?(tp-*cpp):(int)strlen(*cpp), 63);
strncpy(b, *cpp, L);
*(b + L) = '\0';
*cpp += L;
