PERFORCE change 100502 for review

[Paolo Pisati]

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

Change 100502 by piso at 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);