svn commit: samba r15427 - in branches/SAMBA_4_0/source/librpc/ndr: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-04 11:01:10 +0000 (Thu, 04 May 2006)
New Revision: 15427

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15427

Log:
Rename private to private_data to prevent errors from C++ errors (which 
we care about in Samba3)

Modified:
   branches/SAMBA_4_0/source/librpc/ndr/libndr.h
   branches/SAMBA_4_0/source/librpc/ndr/ndr.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h	2006-05-04 10:03:41 UTC (rev 15426)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h	2006-05-04 11:01:10 UTC (rev 15427)
@@ -105,7 +105,7 @@
 	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)

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2006-05-04 10:03:41 UTC (rev 15426)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2006-05-04 11:01:10 UTC (rev 15427)
@@ -207,13 +207,13 @@
 	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 @@
 
 	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;