From owner-p4-projects@FreeBSD.ORG  Mon Jul  3 15:17:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98A4816A417; Mon,  3 Jul 2006 15:17:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 47D1716A601
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 15:17:22 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 117A7443DF
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 14:48:08 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k63Em7O9098158
	for <perforce@freebsd.org>; Mon, 3 Jul 2006 14:48:07 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63Em7DN098155
	for perforce@freebsd.org; Mon, 3 Jul 2006 14:48:07 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 3 Jul 2006 14:48:07 GMT
Message-Id: <200607031448.k63Em7DN098155@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100502 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 03 Jul 2006 15:17:24 -0000

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

Change 100502 by piso@piso_newluxor on 2006/07/03 14:47:27

	Fix kernel-side compilation

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#3 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#3 (text+ko) ====

@@ -216,8 +216,8 @@
 	LIBALIAS_WLOCK(&handler_chain);
 	for (i=0; 1; i++) {
 		if (*((int *)&_p[i]) == EOH) break;
-		res = _attach_handler(&handler_chain, &_p[i]);
-		if (res != OK) break;
+		error = _attach_handler(&handler_chain, &_p[i]);
+		if (error != OK) break;
 	}
 	LIBALIAS_WUNLOCK(&handler_chain);
 	return (error);
@@ -230,8 +230,8 @@
 	LIBALIAS_WLOCK(&handler_chain);
 	for (i=0; 1; i++) {
 		if (*((int *)&_p[i]) == EOH) break;
-		res = _detach_handler(&handler_chain, &_p[i]);
-		if (res != OK) break;
+		error = _detach_handler(&handler_chain, &_p[i]);
+		if (error != OK) break;
 	}
 	LIBALIAS_WUNLOCK(&handler_chain);
 	return (error);
@@ -242,7 +242,7 @@
 	int error = NOK;
 
 	LIBALIAS_WLOCK(&handler_chain);
-	res = _detach_handler(&handler_chain, _p);
+	error = _detach_handler(&handler_chain, _p);
 	LIBALIAS_WUNLOCK(&handler_chain);
 	return (error);
 }
@@ -253,10 +253,10 @@
 	int error;
 
 	LIBALIAS_RLOCK(&handler_chain);
-	for (p = handler_chain.chain, err = EHDNOF; p != NULL; p = p->next)
+	for (p = handler_chain.chain, error = EHDNOF; p != NULL; p = p->next)
 		if ((p->dir & dir) && (p->proto & proto))
 			if (p->fingerprint(la, pip, ad) == OK) {
-				err = p->protohandler(la, pip, ad);
+				error = p->protohandler(la, pip, ad);
 				break;
 			}
 	LIBALIAS_RUNLOCK(&handler_chain);