svn commit: samba r16780 - in trunk/source/locking: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-07-03 13:36:11 +0000 (Mon, 03 Jul 2006)
New Revision: 16780

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16780

Log:
The tdb_chainunlock is happening in the destructor.

Two C++ warnings.

Volker

Modified:
   trunk/source/locking/brlock.c


Changeset:
Modified: trunk/source/locking/brlock.c
===================================================================
--- trunk/source/locking/brlock.c	2006-07-03 11:19:48 UTC (rev 16779)
+++ trunk/source/locking/brlock.c	2006-07-03 13:36:11 UTC (rev 16780)
@@ -1346,7 +1346,7 @@
 	}
 
 	if (orig_num_locks != num_locks) {
-		dbuf.dptr = (void *)locks;
+		dbuf.dptr = (char *)locks;
 		dbuf.dsize = num_locks * sizeof(*locks);
 
 		if (dbuf.dsize) {
@@ -1408,7 +1408,7 @@
 		}
 	} else {
 		TDB_DATA data;
-		data.dptr = br_lck->lock_data;
+		data.dptr = (char *)br_lck->lock_data;
 		data.dsize = br_lck->num_locks * sizeof(struct lock_struct);
 
 		if (tdb_store(tdb, key, data, TDB_REPLACE) == -1) {
@@ -1472,7 +1472,6 @@
 			(struct lock_struct *)br_lck->lock_data;
 
 		if (!validate_lock_entries(&br_lck->num_locks, &locks)) {
-			tdb_chainunlock(tdb, key);
 			SAFE_FREE(br_lck->lock_data);
 			TALLOC_FREE(br_lck);
 			return NULL;