From 268a52ce44d9aab71e38ae544d0bd954470c0138 Mon Sep 17 00:00:00 2001
From: "Robert S. French" <rfrench@mit.edu>
Date: Sun, 28 Jun 1987 22:24:54 +0000
Subject: Fixed ZCompareUID problem

---
 lib/ZLocateU.c   |  2 +-
 lib/ZLocations.c |  2 +-
 lib/ZSendPkt.c   | 12 ++----------
 3 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/ZLocateU.c b/lib/ZLocateU.c
index 443cee4..42a1218 100644
--- a/lib/ZLocateU.c
+++ b/lib/ZLocateU.c
@@ -45,7 +45,7 @@ Code_t ZLocateUser(user,nlocs)
 		return (retval);
 
 	if ((retval = ZIfNotice(buffer,sizeof buffer,&retnotice,&auth,
-				ZCompareUID,(char *)&notice.z_uid)) !=
+				ZCompareUIDPred,(char *)&notice.z_uid)) !=
 	    ZERR_NONE)
 		return (retval);
 
diff --git a/lib/ZLocations.c b/lib/ZLocations.c
index 0ec5ce0..0da0f90 100644
--- a/lib/ZLocations.c
+++ b/lib/ZLocations.c
@@ -46,7 +46,7 @@ Code_t ZSetLocation()
 		return (retval);
 
 	if ((retval = ZIfNotice(buffer,sizeof buffer,&retnotice,0,
-			        ZCompareUID,(char *)&notice.z_uid)) !=
+			        ZCompareUIDPred,(char *)&notice.z_uid)) !=
 	    ZERR_NONE)
 		return (retval);
 
diff --git a/lib/ZSendPkt.c b/lib/ZSendPkt.c
index 58b630c..0058eb3 100644
--- a/lib/ZSendPkt.c
+++ b/lib/ZSendPkt.c
@@ -21,8 +21,6 @@ Code_t ZSendPacket(packet,len)
 	ZPacket_t	packet;
 	int		len;
 {
-	int findack();
-	
 	Code_t retval;
 	struct sockaddr_in dest;
 	struct timeval tv;
@@ -55,7 +53,8 @@ Code_t ZSendPacket(packet,len)
 	for (i=0;i<HM_TIMEOUT*2;i++) {
 		select(0,&t1,&t2,&t3,&tv);
 		retval = ZCheckIfNotice(ackpack,sizeof ackpack,&notice,
-					&auth,findack,(char *)&notice.z_uid);
+					&auth,ZCompareUIDPred,
+					(char *)&notice.z_uid);
 		if (retval == ZERR_NONE)
 			return (ZERR_NONE);
 		if (retval != ZERR_NONOTICE)
@@ -63,10 +62,3 @@ Code_t ZSendPacket(packet,len)
 	}
 	return (ZERR_HMDEAD);
 }
-
-static int findack(notice,uid)
-	ZNotice_t *notice;
-	ZUnique_Id_t *uid;
-{
-	return (ZCompareUID(uid,&notice->z_uid));
-}
-- 
cgit v1.2.3