Module Name: src
Committed By: joerg
Date: Fri Jan 8 19:01:12 UTC 2016
Modified Files:
src/external/bsd/bind/dist/lib/isc: netaddr.c
src/external/bsd/ntp/dist/lib/isc: netaddr.c
Log Message:
Don't increment the induction variable twice.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/lib/isc/netaddr.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/lib/isc/netaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/isc/netaddr.c
diff -u src/external/bsd/bind/dist/lib/isc/netaddr.c:1.6 src/external/bsd/bind/dist/lib/isc/netaddr.c:1.7
--- src/external/bsd/bind/dist/lib/isc/netaddr.c:1.6 Wed Dec 10 04:37:59 2014
+++ src/external/bsd/bind/dist/lib/isc/netaddr.c Fri Jan 8 19:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netaddr.c,v 1.6 2014/12/10 04:37:59 christos Exp $ */
+/* $NetBSD: netaddr.c,v 1.7 2016/01/08 19:01:12 joerg Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2010-2012, 2014 Internet Systems Consortium, Inc. ("ISC")
@@ -281,7 +281,6 @@ isc_netaddr_masktoprefixlen(const isc_ne
for (; i < ipbytes; i++) {
if (p[i] != 0)
return (ISC_R_MASKNONCONTIG);
- i++;
}
*lenp = nbytes * 8 + nbits;
return (ISC_R_SUCCESS);
Index: src/external/bsd/ntp/dist/lib/isc/netaddr.c
diff -u src/external/bsd/ntp/dist/lib/isc/netaddr.c:1.7 src/external/bsd/ntp/dist/lib/isc/netaddr.c:1.8
--- src/external/bsd/ntp/dist/lib/isc/netaddr.c:1.7 Fri Jul 10 14:20:29 2015
+++ src/external/bsd/ntp/dist/lib/isc/netaddr.c Fri Jan 8 19:01:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netaddr.c,v 1.7 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: netaddr.c,v 1.8 2016/01/08 19:01:12 joerg Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC")
@@ -282,7 +282,6 @@ isc_netaddr_masktoprefixlen(const isc_ne
for (; i < ipbytes; i++) {
if (p[i] != 0)
return (ISC_R_MASKNONCONTIG);
- i++;
}
*lenp = nbytes * 8 + nbits;
return (ISC_R_SUCCESS);
