Changeset 298 for branches/samba-3.0

Timestamp:

Jul 3, 2009, 10:21:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

3.0.35 fix logging changes that slipped in with changeset #286

File:

• branches/samba-3.0/source/tdb/common/lock.c (modified) (11 diffs)

branches/samba-3.0/source/tdb/common/lock.c

@@ -1 @@
- /* 
+/* 
    Unix SMB/CIFS implementation.
 
@@ -87 +87 @@
                 break;
         default:
-#ifdef __OS2LOCKDEBUG__
+#if 0
                 printf( "_mutex_brlock unknown offset %d\n", offset);
 #endif
@@ -93 +93 @@
         }
         if (hSem == 0) {
-#ifdef __OS2LOCKDEBUG__
+#if 0
                 printf( "_mutex_brlock unknown sem handle offset %d\n", offset);
 #endif
                 exit(1);
         }
-#ifdef __OS2LOCKDEBUG__
+#if 1
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"_mutex_brlock handle %d, offset %d\n", hSem, offset));
 #endif
@@ -116 +116 @@
                 break;
         default:
-#ifdef __OS2LOCKDEBUG__
+#if 0
                 printf( "_mutex_brlock unknown rw_type request %d\n", rw_type);
 #endif
@@ -129 +129 @@
 
         errno = EINVAL;
-#ifdef __OS2LOCKDEBUG__
+#if 1
         TDB_LOG(( tdb, TDB_DEBUG_ERROR, "_mutex_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d, rc=%d\n", 
                  getpid(), tdb->fd, offset, rw_type, lck_type, (int)len, rc));
@@ -163 +163 @@
         off_t       cbRange;
 
-#ifdef __OS2LOCKDEBUG__
+#if 1
         TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
                 getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len));
@@ -211 +211 @@
         rc = DosSetFileLocks(tdb->fd, &aflock[0], &aflock[1], SEM_IMMEDIATE_RETURN, fAccess);
         if (rc != NO_ERROR) {
-#ifdef __OS2LOCKDEBUG__
+#if 1
                 TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, rc=%d FAILED\n",
                         getpid(), tdb->fd, rc));
@@ -217 +217 @@
         }
         if (rc != NO_ERROR && lck_type == F_SETLKW) {
-#ifdef __OS2LOCKDEBUG__
+#if 1
                 TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, rc=%d RETRY WAIT\n",
                         getpid(), tdb->fd, rc));
@@ -224 +224 @@
                 do {
                         rc = DosSetFileLocks(tdb->fd, &aflock[0], &aflock[1], 100, fAccess);
-#ifdef __OS2LOCKDEBUG__
+#if 1
                         TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, rc=%d RETRY WAIT(%d)\n",
                                 getpid(), tdb->fd, rc,count));
@@ -243 +243 @@
                                  tdb->fd, offset, rw_type, lck_type, (int)len));
                 }
-#ifdef __OS2LOCKDEBUG__
+#if 1
                 TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d\n", 
                          getpid(), tdb->fd, offset, rw_type, lck_type, (int)len));
@@ -249 +249 @@
                 return TDB_ERRCODE(TDB_ERR_LOCK, -1);
         }
-#ifdef __OS2LOCKDEBUG__
+#if 1
         TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d DONE\n",
                 getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len));