summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr/ndr.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-07 15:08:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:05:27 -0500
commitcd962355abad90a2161765a7be7d26e63572cab7 (patch)
tree21a1e180cfa6396c491301e3e171d8105208bb44 /source4/librpc/ndr/ndr.c
parent6c79213eb80283bb211d2e2161c25337c0a549b7 (diff)
downloadsamba-cd962355abad90a2161765a7be7d26e63572cab7.tar.gz
samba-cd962355abad90a2161765a7be7d26e63572cab7.tar.bz2
samba-cd962355abad90a2161765a7be7d26e63572cab7.zip
r25000: Fix some more C++ compatibility warnings.
(This used to be commit 08bb1ef643ab906f1645cf6f32763dc73b1884e4)
Diffstat (limited to 'source4/librpc/ndr/ndr.c')
-rw-r--r--source4/librpc/ndr/ndr.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 9fb39beff3..a9e42f1eb6 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -200,13 +200,16 @@ _PUBLIC_ 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");
}
/*
@@ -276,7 +279,7 @@ _PUBLIC_ char *ndr_print_struct_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, c
ndr->depth = 1;
ndr->flags = 0;
fn(ndr, name, ptr);
- ret = talloc_steal(mem_ctx, ndr->private_data);
+ ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
failed:
talloc_free(ndr);
return ret;
@@ -301,7 +304,7 @@ _PUBLIC_ char *ndr_print_union_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, co
ndr->flags = 0;
ndr_print_set_switch_value(ndr, ptr, level);
fn(ndr, name, ptr);
- ret = talloc_steal(mem_ctx, ndr->private_data);
+ ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
failed:
talloc_free(ndr);
return ret;
@@ -327,7 +330,7 @@ _PUBLIC_ char *ndr_print_function_string(TALLOC_CTX *mem_ctx,
ndr->depth = 1;
ndr->flags = 0;
fn(ndr, name, flags, ptr);
- ret = talloc_steal(mem_ctx, ndr->private_data);
+ ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
failed:
talloc_free(ndr);
return ret;