sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

r18851: Some C++ warnings

Browse Source 
(This used to be commit 69f05f288ce7a8508760db861d0910495bd1d578)
This commit is contained in:
Volker Lendecke 2006-09-23 20:29:54 +00:00 committed by Gerald (Jerry) Carter
parent 5be2871481
commit 51f27dc3f1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source4/lib/ldb/tools/cmdline.c
View File

@ -285,7 +285,7 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings)
} }
if (ctxid[0]) { if (ctxid[0]) {
control->ctxid_len = ldb_base64_decode(ctxid); 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 { } else {
control->ctxid_len = 0; control->ctxid_len = 0;
control->contextId = NULL; control->contextId = NULL;
@ -327,7 +327,7 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings)
control->max_attributes = max_attrs; control->max_attributes = max_attrs;
if (*cookie) { if (*cookie) {
control->cookie_len = ldb_base64_decode(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 { } else {
control->cookie = NULL; control->cookie = NULL;
control->cookie_len = 0; control->cookie_len = 0;
@ -671,9 +671,9 @@ int handle_controls_reply(struct ldb_control **reply, struct ldb_control **reque
if (req_control->cookie) if (req_control->cookie)
talloc_free(req_control->cookie); talloc_free(req_control->cookie);
req_control->cookie = talloc_memdup(req_control, req_control->cookie = (char *)talloc_memdup(
rep_control->cookie, req_control, rep_control->cookie,
rep_control->cookie_len); rep_control->cookie_len);
req_control->cookie_len = rep_control->cookie_len; req_control->cookie_len = rep_control->cookie_len;
ret = 1; ret = 1;
@ -727,9 +727,9 @@ int handle_controls_reply(struct ldb_control **reply, struct ldb_control **reque
if (req_control->cookie) if (req_control->cookie)
talloc_free(req_control->cookie); talloc_free(req_control->cookie);
req_control->cookie = talloc_memdup(req_control, req_control->cookie = (char *)talloc_memdup(
rep_control->cookie, req_control, rep_control->cookie,
rep_control->cookie_len); rep_control->cookie_len);
req_control->cookie_len = 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); cookie = ldb_base64_encode(req_control, rep_control->cookie, rep_control->cookie_len);