From: VMware, Inc <>
Date: Tue, 19 Oct 2010 19:18:01 +0000 (-0700)
Subject: lib/lock: loose the internal const
X-Git-Tag: 2010.10.18-313025~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe8bdc3b7569220ba362a8723373adbccfdf18b4;p=thirdparty%2Fopen-vm-tools.git

lib/lock: loose the internal const

The internal const lead to a cast in every destroy function.
This crept in early on and hasn't been cleaned out. Do so now.

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 6591d7bf5..407629b4b 100644
--- a/open-vm-tools/lib/lock/ulBarrier.c
+++ b/open-vm-tools/lib/lock/ulBarrier.c
@@ -203,7 +203,7 @@ MXUser_DestroyBarrier(MXUserBarrier *barrier)  // IN:
       MXUser_DestroyExclLock(barrier->lock);
 
       barrier->header.signature = 0;  // just in case...
-      free((void *) barrier->header.name);  // avoid const warnings
+      free(barrier->header.name);
       barrier->header.name = NULL;
       free(barrier);
    }
diff --git a/open-vm-tools/lib/lock/ulExcl.c b/open-vm-tools/lib/lock/ulExcl.c
index 99d147512..48a155ce0 100644
--- a/open-vm-tools/lib/lock/ulExcl.c
+++ b/open-vm-tools/lib/lock/ulExcl.c
@@ -262,7 +262,7 @@ MXUser_DestroyExclLock(MXUserExclLock *lock)  // IN:
       }
 
       lock->header.signature = 0;  // just in case...
-      free((void *) lock->header.name);  // avoid const warnings
+      free(lock->header.name);
       lock->header.name = NULL;
       free(lock);
    }
diff --git a/open-vm-tools/lib/lock/ulInt.h b/open-vm-tools/lib/lock/ulInt.h
index 9ab7cc238..415718687 100644
--- a/open-vm-tools/lib/lock/ulInt.h
+++ b/open-vm-tools/lib/lock/ulInt.h
@@ -416,7 +416,7 @@ MXUserGetNativeTID(void)
 typedef struct MXUserHeader {
    uint32       signature;
    MX_Rank      rank;
-   const char  *name;
+   char        *name;
    uint32       identifier;
    void       (*dumpFunc)(struct MXUserHeader *);
 
diff --git a/open-vm-tools/lib/lock/ulRW.c b/open-vm-tools/lib/lock/ulRW.c
index 85d2e9d8a..ffc3f5f70 100644
--- a/open-vm-tools/lib/lock/ulRW.c
+++ b/open-vm-tools/lib/lock/ulRW.c
@@ -31,6 +31,12 @@
 
 #define MXUSER_RW_SIGNATURE 0x57524B4C // 'LKRW' in memory
 
+static void
+MXUserFreeHashEntry(void *data)  // IN:
+{
+   free(data);
+}
+
 
 /*
  * Environment specific implementations of portable read-write locks.
@@ -397,12 +403,6 @@ MXUserDumpRWLock(MXUserHeader *header)  // IN:
  *-----------------------------------------------------------------------------
  */
 
-static void
-MXUserFreeHashEntry(void *data)  // IN:
-{
-   free(data);
-}
-
 MXUserRWLock *
 MXUser_CreateRWLock(const char *userName,  // IN:
                     MX_Rank rank)          // IN:
@@ -544,7 +544,7 @@ MXUser_DestroyRWLock(MXUserRWLock *lock)  // IN:
 
       HashTable_FreeUnsafe(lock->holderTable);
       lock->header.signature = 0;  // just in case...
-      free((void *) lock->header.name);  // avoid const warnings
+      free(lock->header.name);
       lock->header.name = NULL;
       free(lock);
    }
diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c
index d9ac961a8..819617c95 100644
--- a/open-vm-tools/lib/lock/ulRec.c
+++ b/open-vm-tools/lib/lock/ulRec.c
@@ -358,7 +358,7 @@ MXUser_DestroyRecLock(MXUserRecLock *lock)  // IN:
       }
 
       lock->header.signature = 0;  // just in case...
-      free((void *) lock->header.name);  // avoid const warnings
+      free(lock->header.name);
       lock->header.name = NULL;
       free(lock);
    }
diff --git a/open-vm-tools/lib/lock/ulSema.c b/open-vm-tools/lib/lock/ulSema.c
index 075e0d924..fd467691f 100644
--- a/open-vm-tools/lib/lock/ulSema.c
+++ b/open-vm-tools/lib/lock/ulSema.c
@@ -593,7 +593,7 @@ MXUser_DestroySemaphore(MXUserSemaphore *sema)  // IN:
       }
 
       sema->header.signature = 0;  // just in case...
-      free((void *) sema->header.name);  // avoid const warnings
+      free(sema->header.name);
       sema->header.name = NULL;
       free(sema);
    }