diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-04 11:01:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:36 -0500 |
| commit | 2420b38336eafb956187f84c4757cbb9512e5f82 (patch) | |
| tree | 3bc7088146288a1fbaed8a677e23ae1e08febdbe | |
| parent | 5f4d86f955d939e96ec9b81c8a9d080aab4354b6 (diff) | |
| download | samba-2420b38336eafb956187f84c4757cbb9512e5f82.tar.gz samba-2420b38336eafb956187f84c4757cbb9512e5f82.tar.bz2 samba-2420b38336eafb956187f84c4757cbb9512e5f82.zip | |
r15427: Rename private to private_data to prevent errors from C++ errors (which
we care about in Samba3)
(This used to be commit eb07aea711a5e3606e169d77b208b03bd876c639)
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index c83e70ff50..6299629608 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -105,7 +105,7 @@ struct ndr_print { uint32_t depth; struct ndr_token_list *switch_list; void (*print)(struct ndr_print *, const char *, ...); - void *private; + void *private_data; }; #define LIBNDR_FLAG_BIGENDIAN (1<<0) diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 97434f0495..74d966a9d9 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -207,13 +207,13 @@ static void ndr_print_string_helper(struct ndr_print *ndr, const char *format, . int i; for (i=0;i<ndr->depth;i++) { - ndr->private = talloc_asprintf_append(ndr->private, " "); + ndr->private_data = talloc_asprintf_append(ndr->private_data, " "); } va_start(ap, format); - ndr->private = talloc_vasprintf_append(ndr->private, format, ap); + ndr->private_data = talloc_vasprintf_append(ndr->private_data, format, ap); va_end(ap); - ndr->private = talloc_asprintf_append(ndr->private, "\n"); + ndr->private_data = talloc_asprintf_append(ndr->private_data, "\n"); } /* @@ -278,15 +278,15 @@ _PUBLIC_ char *ndr_print_function_string(TALLOC_CTX *mem_ctx, ndr = talloc_zero(mem_ctx, struct ndr_print); if (!ndr) return NULL; - ndr->private = talloc_strdup(ndr, ""); - if (!ndr->private) { + ndr->private_data = talloc_strdup(ndr, ""); + if (!ndr->private_data) { goto failed; } ndr->print = ndr_print_string_helper; ndr->depth = 1; ndr->flags = 0; fn(ndr, name, flags, ptr); - ret = talloc_steal(mem_ctx, ndr->private); + ret = talloc_steal(mem_ctx, ndr->private_data); failed: talloc_free(ndr); return ret; |