diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-09-23 20:29:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:20:16 -0500 |
| commit | 51f27dc3f19e9916155ecad64662b874d1fea229 (patch) | |
| tree | 2676ae85869f0a14c694ed460696b23a879b71ef /source4 | |
| parent | 5be2871481af5607d0886a35d2608aabf2de83bc (diff) | |
| download | samba-51f27dc3f19e9916155ecad64662b874d1fea229.tar.gz samba-51f27dc3f19e9916155ecad64662b874d1fea229.tar.bz2 samba-51f27dc3f19e9916155ecad64662b874d1fea229.zip | |
r18851: Some C++ warnings
(This used to be commit 69f05f288ce7a8508760db861d0910495bd1d578)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index cb811452b8..09bb99c096 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -285,7 +285,7 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings) } 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 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings) 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 @@ int handle_controls_reply(struct ldb_control **reply, struct ldb_control **reque 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 @@ int handle_controls_reply(struct ldb_control **reply, struct ldb_control **reque 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); |