svn commit: samba r16781 - in branches/tmp/vl-messaging/source: lib locking

[vlendec at samba.org]

Author: vlendec
Date: 2006-07-03 13:38:12 +0000 (Mon, 03 Jul 2006)
New Revision: 16781

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

Log:
C++-warnings
Modified:
   branches/tmp/vl-messaging/source/lib/dbwrap_file.c
   branches/tmp/vl-messaging/source/locking/brlock.c


Changeset:
Modified: branches/tmp/vl-messaging/source/lib/dbwrap_file.c
===================================================================
--- branches/tmp/vl-messaging/source/lib/dbwrap_file.c	2006-07-03 13:36:11 UTC (rev 16780)
+++ branches/tmp/vl-messaging/source/lib/dbwrap_file.c	2006-07-03 13:38:12 UTC (rev 16781)
@@ -99,7 +99,7 @@
 	}
 
 	result->key.dsize = key.dsize;
-	result->key.dptr = talloc_memdup(result, key.dptr, key.dsize);
+	result->key.dptr = (char *)talloc_memdup(result, key.dptr, key.dsize);
 	if (result->key.dptr == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		TALLOC_FREE(result);
@@ -189,7 +189,7 @@
 	}
 
 	ctx->locked_record = result;
-	file->parent = talloc_reference(file, ctx);
+	file->parent = (struct db_file_ctx *)talloc_reference(file, ctx);
 
 	return result;
 }
@@ -316,7 +316,8 @@
 			}
 
 			data.dsize = rec->value.dsize;
-			data.dptr = talloc_memdup(mem_ctx, rec->value.dptr, rec->value.dsize);
+			data.dptr = (char *)talloc_memdup(
+				mem_ctx, rec->value.dptr, rec->value.dsize);
 			if(data.dptr == NULL) {
 				DEBUG(0, ("talloc failed\n"));
 				TALLOC_FREE(rec);

Modified: branches/tmp/vl-messaging/source/locking/brlock.c
===================================================================
--- branches/tmp/vl-messaging/source/locking/brlock.c	2006-07-03 13:36:11 UTC (rev 16780)
+++ branches/tmp/vl-messaging/source/locking/brlock.c	2006-07-03 13:38:12 UTC (rev 16781)
@@ -1348,7 +1348,7 @@
 	if (orig_num_locks != num_locks) {
 		struct db_record *rec;
 
-		dbuf.dptr = (void *)locks;
+		dbuf.dptr = (char *)locks;
 		dbuf.dsize = num_locks * sizeof(*locks);
 
 		rec = brlock_db->fetch_locked(brlock_db, brlock_db, kbuf);
@@ -1413,7 +1413,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 (br_lck->record->store(br_lck->record, data, TDB_REPLACE) == -1) {