svn commit: samba r16783 - in branches/tmp/vl-messaging/source/lib: .

vlendec at samba.org vlendec at samba.org
Mon Jul 3 14:07:35 GMT 2006


Author: vlendec
Date: 2006-07-03 14:07:35 +0000 (Mon, 03 Jul 2006)
New Revision: 16783

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

Log:
Reformatting/Warnings
Modified:
   branches/tmp/vl-messaging/source/lib/dbwrap_msg.c
   branches/tmp/vl-messaging/source/lib/dbwrap_tdb.c


Changeset:
Modified: branches/tmp/vl-messaging/source/lib/dbwrap_msg.c
===================================================================
--- branches/tmp/vl-messaging/source/lib/dbwrap_msg.c	2006-07-03 13:51:50 UTC (rev 16782)
+++ branches/tmp/vl-messaging/source/lib/dbwrap_msg.c	2006-07-03 14:07:35 UTC (rev 16783)
@@ -96,7 +96,7 @@
 }
 
 static BOOL msg_unpack_data(const char *buf, size_t len,
-							TALLOC_CTX *mem_ctx, int *idx, TDB_DATA *data)
+			    TALLOC_CTX *mem_ctx, int *idx, TDB_DATA *data)
 {
 	TDB_DATA res;
 	
@@ -323,7 +323,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(ctx->record);
@@ -332,8 +332,8 @@
 	}
 
 	result->value.dsize = ctx->record->value.dsize;
-	result->value.dptr = talloc_memdup(result, ctx->record->value.dptr,
-									 ctx->record->value.dsize);
+	result->value.dptr = (char *)talloc_memdup(
+		result, ctx->record->value.dptr, ctx->record->value.dsize);
 	if(result->value.dptr == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		TALLOC_FREE(ctx->record);
@@ -448,7 +448,7 @@
 }
 
 void handle_fetchlock_return(int msg_type, struct process_id pid,
-							   void *buf, size_t len)
+			     void *buf, size_t len)
 {
 	struct db_record *result;
 	struct db_msg_ctx *ctx = ctx_list;	
@@ -457,7 +457,7 @@
 
 	DEBUG(10, ("msg_fetchlock received with len %d\n", len));
 
-	if(!msg_unpack_data(buf, len, NULL, &idx, &value)) {
+	if(!msg_unpack_data((const char *)buf, len, NULL, &idx, &value)) {
 		DEBUG(2, ("Unpacking error\n"));
 		return ;
 	}
@@ -482,7 +482,8 @@
 
 	if(value.dsize > 0) {
 		result->value.dsize = value.dsize;
-		result->value.dptr = talloc_memdup(result, value.dptr, value.dsize);
+		result->value.dptr = (char *)talloc_memdup(
+			result, value.dptr, value.dsize);
 		if (result->value.dptr == NULL) {
 			DEBUG(0, ("talloc failed\n"));
 			TALLOC_FREE(value.dptr);

Modified: branches/tmp/vl-messaging/source/lib/dbwrap_tdb.c
===================================================================
--- branches/tmp/vl-messaging/source/lib/dbwrap_tdb.c	2006-07-03 13:51:50 UTC (rev 16782)
+++ branches/tmp/vl-messaging/source/lib/dbwrap_tdb.c	2006-07-03 14:07:35 UTC (rev 16783)
@@ -59,7 +59,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);
@@ -94,7 +94,8 @@
 	}
 
 	result->value.dsize = value.dsize;
-	result->value.dptr = talloc_memdup(result, value.dptr, value.dsize);
+	result->value.dptr = (char *)talloc_memdup(result, value.dptr,
+						   value.dsize);
 	if (result->value.dptr == NULL) {
 		DEBUG(3, ("talloc failed\n"));
 		TALLOC_FREE(result);
@@ -133,7 +134,8 @@
 static int db_tdb_traverse_func(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
 				void *private_data)
 {
-	struct db_tdb_traverse_ctx *ctx = private_data;
+	struct db_tdb_traverse_ctx *ctx =
+		(struct db_tdb_traverse_ctx *)private_data;
 	return ctx->f(kbuf, dbuf, ctx->private_data);
 }
 



More information about the samba-cvs mailing list