summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-11-27 08:11:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:09 -0500
commitfb5d4f9c863c5486eed607dfb723254411758f89 (patch)
tree107c1e075f32a80f54c12c0f562cf0aa5929b4b9
parent2d6e409dc237035fd6c53bc45e6d822ad7776731 (diff)
downloadsamba-fb5d4f9c863c5486eed607dfb723254411758f89.tar.gz
samba-fb5d4f9c863c5486eed607dfb723254411758f89.tar.bz2
samba-fb5d4f9c863c5486eed607dfb723254411758f89.zip
r19916: Fix some c++ warnings
(This used to be commit fb5bcb826ecd10a81e7b19c0ce134ec88d341843)
-rw-r--r--source3/librpc/ndr/ndr.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/librpc/ndr/ndr.c b/source3/librpc/ndr/ndr.c
index 2aff7a88f0..f6a132c186 100644
--- a/source3/librpc/ndr/ndr.c
+++ b/source3/librpc/ndr/ndr.c
@@ -205,13 +205,16 @@ static void ndr_print_string_helper(struct ndr_print *ndr, const char *format, .
int i;
for (i=0;i<ndr->depth;i++) {
- ndr->private_data = talloc_asprintf_append(ndr->private_data, " ");
+ ndr->private_data = talloc_asprintf_append(
+ (char *)ndr->private_data, " ");
}
va_start(ap, format);
- ndr->private_data = talloc_vasprintf_append(ndr->private_data, format, ap);
+ ndr->private_data = talloc_vasprintf_append(
+ (char *)ndr->private_data, format, ap);
va_end(ap);
- ndr->private_data = talloc_asprintf_append(ndr->private_data, "\n");
+ ndr->private_data = talloc_asprintf_append(
+ (char *)ndr->private_data, "\n");
}
/*
@@ -284,7 +287,7 @@ char *ndr_print_function_string(TALLOC_CTX *mem_ctx,
ndr->depth = 1;
ndr->flags = 0;
fn(ndr, name, flags, ptr);
- ret = ndr->private_data;
+ ret = (char *)ndr->private_data;
talloc_free(ndr);
return ret;
}