svn commit: samba r18851 - in branches/SAMBA_4_0/source/lib/ldb/tools: .

vlendec at samba.org vlendec at samba.org
Sat Sep 23 20:29:54 GMT 2006


Author: vlendec
Date: 2006-09-23 20:29:54 +0000 (Sat, 23 Sep 2006)
New Revision: 18851

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

Log:
Some C++ warnings
Modified:
   branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2006-09-23 19:17:50 UTC (rev 18850)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2006-09-23 20:29:54 UTC (rev 18851)
@@ -285,7 +285,7 @@
 			}
 			if (ctxid[0]) {
 				control->ctxid_len = ldb_base64_decode(ctxid);
-				control->contextId = talloc_memdup(control, ctxid, control->ctxid_len);
+				control->contextId = (char *)talloc_memdup(control, ctxid, control->ctxid_len);
 			} else {
 				control->ctxid_len = 0;
 				control->contextId = NULL;
@@ -327,7 +327,7 @@
 			control->max_attributes = max_attrs;
 			if (*cookie) {
 				control->cookie_len = ldb_base64_decode(cookie);
-				control->cookie = talloc_memdup(control, cookie, control->cookie_len);
+				control->cookie = (char *)talloc_memdup(control, cookie, control->cookie_len);
 			} else {
 				control->cookie = NULL;
 				control->cookie_len = 0;
@@ -671,9 +671,9 @@
 
 			if (req_control->cookie)
 				talloc_free(req_control->cookie);
-			req_control->cookie = talloc_memdup(req_control,
-							    rep_control->cookie,
-							    rep_control->cookie_len);
+			req_control->cookie = (char *)talloc_memdup(
+				req_control, rep_control->cookie,
+				rep_control->cookie_len);
 			req_control->cookie_len = rep_control->cookie_len;
 
 			ret = 1;
@@ -727,9 +727,9 @@
 
 			if (req_control->cookie)
 				talloc_free(req_control->cookie);
-			req_control->cookie = talloc_memdup(req_control, 
-							    rep_control->cookie,
-							    rep_control->cookie_len);
+			req_control->cookie = (char *)talloc_memdup(
+				req_control, rep_control->cookie,
+				rep_control->cookie_len);
 			req_control->cookie_len = rep_control->cookie_len;
 
 			cookie = ldb_base64_encode(req_control, rep_control->cookie, rep_control->cookie_len);



More information about the samba-cvs mailing list