Changeset 829 for branches/samba-3.5.x/lib/tdb/common/open.c

Timestamp:

Nov 13, 2013, 2:36:44 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: backported some code from 3.6

File:

• branches/samba-3.5.x/lib/tdb/common/open.c (modified) (6 diffs)

branches/samba-3.5.x/lib/tdb/common/open.c

@@ -185 +185 @@
 
 #ifdef __OS2__
-        if (os2_crtsem(tdb, name, "tdb_open_ex") != 0) {
+        if (os2_CrtSem(tdb, name, "tdb_open_ex") != 0) {
                 goto fail;
         }
@@ -407 +407 @@
         SAFE_FREE(tdb->name);
 #ifdef __OS2__
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
+        os2_DltSem(tdb, "tdb_open_ex");
 #endif
         if (tdb->fd != -1)
@@ -465 +460 @@
         SAFE_FREE(tdb->lockrecs);
 #ifdef __OS2__
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
+        os2_DltSem(tdb, "tdb_close");   
 #endif
 
@@ -514 +504 @@
 
 #ifdef __OS2__
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
-
-        if (os2_crtsem(tdb, tdb->name, "tdb_reopen") != 0) {
+        os2_DltSem(tdb, "tdb_reopen");
+
+        if (os2_CrtSem(tdb, tdb->name, "tdb_reopen") != 0) {
                 goto fail;
         }
@@ -613 +598 @@
 
 #ifdef __OS2__
-int os2_crtsem(struct tdb_context *tdb, const char *name, const char *caller)
+int os2_CrtSem(struct tdb_context *tdb, const char *name, const char *caller)
 {
         // name could be null, so handle it
@@ -661 +646 @@
         return 0;
 }
+
+int os2_DltSem(struct tdb_context *tdb, const char *caller)
+{
+        DosCloseMutexSem( tdb->hGlobalLock);
+        tdb->hGlobalLock = 0;
+        DosCloseMutexSem( tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+        DosCloseMutexSem( tdb->hTransactionLock);
+        tdb->hTransactionLock = 0;
+
+        return 0;
+}
 #endif