From owner-p4-projects@FreeBSD.ORG  Fri May  9 14:48:15 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EAE3D37B404; Fri,  9 May 2003 14:48:14 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A14EC37B401
	for <perforce@freebsd.org>; Fri,  9 May 2003 14:48:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CCB843F3F
	for <perforce@freebsd.org>; Fri,  9 May 2003 14:48:14 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49LmE0U094539
	for <perforce@freebsd.org>; Fri, 9 May 2003 14:48:14 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49LmDhC094536
	for perforce@freebsd.org; Fri, 9 May 2003 14:48:13 -0700 (PDT)
Date: Fri, 9 May 2003 14:48:13 -0700 (PDT)
Message-Id: <200305092148.h49LmDhC094536@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30881 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 May 2003 21:48:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=30881

Change 30881 by peter@peter_hammer on 2003/05/09 14:47:36

	make ppp compile (avoid ICE in gcc-3.2.2) by trivially changing
	the algorithm to something equivalent.

Affected files ...

.. //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#5 edit

Differences ...

==== //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#5 (text+ko) ====

@@ -142,16 +142,16 @@
 {
   const u_char masks[] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe };
   const u_char *c, *p, *end;
-  int masklen;
+  int masklen, m;
 
   p = (const u_char *)mask;
   for (masklen = 0, end = p + 16; p < end && *p == 0xff; p++)
     masklen += 8;
 
   if (p < end) {
-    for (c = masks; c < masks + sizeof masks; c++)
+    for (c = masks, m = 0; c < masks + sizeof masks; c++, m++)
       if (*c == *p) {
-        masklen += c - masks;
+        masklen += m;
         break;
       }
   }