From 79d26e0032dc59afb76d27ea27ae1a15e2df22e8 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 4 Feb 2005 19:56:15 +0000 Subject: [PATCH] Fix merge error in util.c file (Logical change 1.129) git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@459 fd59a12c-fef9-0310-b244-a6a79926bd2f --- lib/util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/util.c b/lib/util.c index cc262841..509f923f 100644 --- a/lib/util.c +++ b/lib/util.c @@ -434,11 +434,10 @@ saHandleDestroy ( SaErrorT saHandleInstanceGet ( struct saHandleDatabase *handleDatabase, - SaUint64T int handle, + SaUint64T handle, void **instance) { SaErrorT error = SA_OK; - pthread_mutex_lock (&handleDatabase->mutex); if (handle >= (SaUint64T)handleDatabase->handleCount) { @@ -464,7 +463,7 @@ error_exit: SaErrorT saHandleInstancePut ( struct saHandleDatabase *handleDatabase, - unsigned int handle) + SaUint64T handle) { void *instance;