From: VMware, Inc <>
Date: Mon, 21 Nov 2011 22:56:23 +0000 (-0800)
Subject: lib/lock: make all instances identical
X-Git-Tag: 2011.11.20-535097~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2da43a0dfdfb8727c4f11e430b1dd2af0ff96625;p=thirdparty%2Fopen-vm-tools.git

lib/lock: make all instances identical

Two places aren't using the new way.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/lock/ulBarrier.c b/open-vm-tools/lib/lock/ulBarrier.c
index 2bef7aa7a..0c1bf5d56 100644
--- a/open-vm-tools/lib/lock/ulBarrier.c
+++ b/open-vm-tools/lib/lock/ulBarrier.c
@@ -204,7 +204,7 @@ MXUser_DestroyBarrier(MXUserBarrier *barrier)  // IN:
       MXUser_DestroyCondVar(barrier->contexts[1].condVar);
       MXUser_DestroyExclLock(barrier->lock);
 
-      barrier->header.signature = 0;  // just in case...
+      MXUserClearSignature(&barrier->header.signature);  // just in case...
       free(barrier->header.name);
       barrier->header.name = NULL;
       free(barrier);
diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c
index 282aa574c..d2a771138 100644
--- a/open-vm-tools/lib/lock/ulRec.c
+++ b/open-vm-tools/lib/lock/ulRec.c
@@ -1009,7 +1009,7 @@ MXUser_BindMXMutexRec(struct MX_MutexRec *mutex,  // IN:
 
    lock = Util_SafeCalloc(1, sizeof(*lock));
 
-   lock->header.signature = MXUSER_REC_SIGNATURE;
+   MXUserSetSignature(&lock->header.signature, MXUSER_REC_SIGNATURE);
    lock->header.name = Str_SafeAsprintf(NULL, "MX_%p", mutex);
    lock->header.rank = rank;
    lock->header.serialNumber = MXUserAllocSerialNumber();