Changeset 825

Timestamp:

Nov 12, 2013, 5:54:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: small code cleanup

Location:

trunk/server/lib/tdb/common

Files:

• lock.c (modified) (2 diffs)
• open.c (modified) (7 diffs)

trunk/server/lib/tdb/common/lock.c

@@ -123 +123 @@
         APIRET      rc;
         ULONG       fAccess = 0; // default exclusiv
-        int         fLock = 1;   // default lock 
-        off_t       cbFile;
-        off_t       offStart;
-        off_t       cbRange;
         FILELOCK    lockArea = {0}, unlockArea = {0}, unlockArea1 = {0};
 
@@ -143 +139 @@
         {
                 case F_UNLCK:
-                        fLock = 0;
                         unlockArea.lOffset = off;
                         unlockArea.lRange  = len ? len : tdb->header.hash_size *4; //was LONG_MAX

trunk/server/lib/tdb/common/open.c

@@ -243 +243 @@
 
 #ifdef __OS2__
-        if (os2_crtsem(tdb, name, "tdb_open_ex") != 0) {
+        if (os2_CrtSem(tdb, "tdb_open_ex") != 0) {
                 goto fail;
         }
@@ -512 +512 @@
                         TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to close tdb->fd on error!\n"));
 #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
         SAFE_FREE(tdb->lockrecs);
@@ -570 +565 @@
 
 #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
         /* Remove from contexts list */
@@ -618 +608 @@
 
 #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_reopen") != 0) {
                 goto fail;
         }
@@ -720 +705 @@
 
 #ifdef __OS2__
-int os2_crtsem(struct tdb_context *tdb, const char *name, const char *caller)
-{
-        // name could be null, so handle it 
-        if (name == NULL) return -1;
+int os2_CrtSem(struct tdb_context *tdb, const char *caller)
+{
+        // tbd->name could be null, so handle it 
+        if (tdb->name == NULL) return -1;
         
         if (!(tdb->flags & TDB_INTERNAL))
@@ -732 +717 @@
                 APIRET  rc;
                 // extract path info
-                _splitpath( name, drive, dir, fname, ext);
+                _splitpath( tdb->name, drive, dir, fname, ext);
                 sprintf( szSem, "\\SEM32\\TDB_OL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hGlobalLock, 0, FALSE);
@@ -768 +753 @@
         return 0;
 }
-#endif
+
+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