svn commit: samba r15120 - in branches/SAMBA_4_0/source/lib/tdb/common: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-04-18 11:26:43 +0000 (Tue, 18 Apr 2006)
New Revision: 15120

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

Log:
Minimize the diff between Samba3 and Samba4 tdb: In Samba3 we don't allow C++
keywords. Change "private" -> "private_data".

Volker

Modified:
   branches/SAMBA_4_0/source/lib/tdb/common/traverse.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/traverse.c	2006-04-18 09:02:58 UTC (rev 15119)
+++ branches/SAMBA_4_0/source/lib/tdb/common/traverse.c	2006-04-18 11:26:43 UTC (rev 15120)
@@ -137,7 +137,7 @@
    a non-zero return value from fn() indicates that the traversal should stop
   */
 static int tdb_traverse_internal(struct tdb_context *tdb, 
-				 tdb_traverse_func fn, void *private,
+				 tdb_traverse_func fn, void *private_data,
 				 struct tdb_traverse_lock *tl)
 {
 	TDB_DATA key, dbuf;
@@ -176,7 +176,7 @@
 			SAFE_FREE(key.dptr);
 			goto out;
 		}
-		if (fn && fn(tdb, key, dbuf, private)) {
+		if (fn && fn(tdb, key, dbuf, private_data)) {
 			/* They want us to terminate traversal */
 			ret = count;
 			if (tdb_unlock_record(tdb, tl->off) != 0) {
@@ -201,7 +201,7 @@
   a write style traverse - temporarily marks the db read only
 */
 int tdb_traverse_read(struct tdb_context *tdb, 
-		      tdb_traverse_func fn, void *private)
+		      tdb_traverse_func fn, void *private_data)
 {
 	struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
 	int ret;
@@ -215,7 +215,7 @@
 	}
 
 	tdb->traverse_read++;
-	ret = tdb_traverse_internal(tdb, fn, private, &tl);
+	ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
 	tdb->traverse_read--;
 
 	tdb->methods->tdb_brlock(tdb, TRANSACTION_LOCK, F_UNLCK, F_SETLKW, 0);
@@ -228,13 +228,13 @@
   prevent deadlocks
 */
 int tdb_traverse(struct tdb_context *tdb, 
-		 tdb_traverse_func fn, void *private)
+		 tdb_traverse_func fn, void *private_data)
 {
 	struct tdb_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
 	int ret;
 
 	if (tdb->read_only || tdb->traverse_read) {
-		return tdb_traverse_read(tdb, fn, private);
+		return tdb_traverse_read(tdb, fn, private_data);
 	}
 	
 	if (tdb->methods->tdb_brlock(tdb, TRANSACTION_LOCK, F_WRLCK, F_SETLKW, 0) == -1) {
@@ -243,7 +243,7 @@
 		return -1;
 	}
 
-	ret = tdb_traverse_internal(tdb, fn, private, &tl);
+	ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
 
 	tdb->methods->tdb_brlock(tdb, TRANSACTION_LOCK, F_UNLCK, F_SETLKW, 0);