From 9a012df08ee829c1d40fc88ba12a0ea479f60be0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 14 Sep 2007 23:21:00 +0000 Subject: r25175: Change to talloc_asprintf_append_buffer(). Jeremy. (This used to be commit 0844dbf597191b3e4d35a696695b229e986daec4) --- source4/librpc/ndr/ndr.c | 6 +++--- source4/librpc/rpc/dcerpc_util.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index a9e42f1eb6..49cfd3a9fe 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -200,15 +200,15 @@ _PUBLIC_ void ndr_print_string_helper(struct ndr_print *ndr, const char *format, int i; for (i=0;idepth;i++) { - ndr->private_data = talloc_asprintf_append( + ndr->private_data = talloc_asprintf_append_buffer( (char *)ndr->private_data, " "); } va_start(ap, format); - ndr->private_data = talloc_vasprintf_append((char *)ndr->private_data, + ndr->private_data = talloc_vasprintf_append_buffer((char *)ndr->private_data, format, ap); va_end(ap); - ndr->private_data = talloc_asprintf_append((char *)ndr->private_data, + ndr->private_data = talloc_asprintf_append_buffer((char *)ndr->private_data, "\n"); } diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index e82302585c..dffba4aedf 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -255,42 +255,42 @@ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b) } if (t_name != NULL) { - s = talloc_asprintf_append(s, "%s:", t_name); + s = talloc_asprintf_append_buffer(s, "%s:", t_name); if (s == NULL) { return NULL; } } if (b->host) { - s = talloc_asprintf_append(s, "%s", b->host); + s = talloc_asprintf_append_buffer(s, "%s", b->host); } if (!b->endpoint && !b->options && !b->flags) { return s; } - s = talloc_asprintf_append(s, "["); + s = talloc_asprintf_append_buffer(s, "["); if (b->endpoint) { - s = talloc_asprintf_append(s, "%s", b->endpoint); + s = talloc_asprintf_append_buffer(s, "%s", b->endpoint); } /* this is a *really* inefficent way of dealing with strings, but this is rarely called and the strings are always short, so I don't care */ for (i=0;b->options && b->options[i];i++) { - s = talloc_asprintf_append(s, ",%s", b->options[i]); + s = talloc_asprintf_append_buffer(s, ",%s", b->options[i]); if (!s) return NULL; } for (i=0;iflags & ncacn_options[i].flag) { - s = talloc_asprintf_append(s, ",%s", ncacn_options[i].name); + s = talloc_asprintf_append_buffer(s, ",%s", ncacn_options[i].name); if (!s) return NULL; } } - s = talloc_asprintf_append(s, "]"); + s = talloc_asprintf_append_buffer(s, "]"); return s; } -- cgit