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

[metze at samba.org]

Author: metze
Date: 2006-03-22 14:33:06 +0000 (Wed, 22 Mar 2006)
New Revision: 14642

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

Log:
fix shadow warnings

metze
Modified:
   branches/SAMBA_4_0/source/librpc/ndr/ndr.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2006-03-22 14:08:59 UTC (rev 14641)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c	2006-03-22 14:33:06 UTC (rev 14642)
@@ -310,9 +310,9 @@
 	(*pflags) |= new_flags;
 }
 
-static NTSTATUS ndr_map_error(enum ndr_err_code err)
+static NTSTATUS ndr_map_error(enum ndr_err_code ndr_err)
 {
-	switch (err) {
+	switch (ndr_err) {
 	case NDR_ERR_BUFSIZE:
 		return NT_STATUS_BUFFER_TOO_SMALL;
 	case NDR_ERR_TOKEN:
@@ -332,8 +332,9 @@
 /*
   return and possibly log an NDR error
 */
-_PUBLIC_ NTSTATUS ndr_pull_error(struct ndr_pull *ndr, 
-			enum ndr_err_code err, const char *format, ...) _PRINTF_ATTRIBUTE(3,4)
+_PUBLIC_ NTSTATUS ndr_pull_error(struct ndr_pull *ndr,
+				 enum ndr_err_code ndr_err,
+				 const char *format, ...) _PRINTF_ATTRIBUTE(3,4)
 {
 	char *s=NULL;
 	va_list ap;
@@ -342,17 +343,19 @@
 	vasprintf(&s, format, ap);
 	va_end(ap);
 
-	DEBUG(3,("ndr_pull_error(%u): %s\n", err, s));
+	DEBUG(3,("ndr_pull_error(%u): %s\n", ndr_err, s));
 
 	free(s);
 
-	return ndr_map_error(err);
+	return ndr_map_error(ndr_err);
 }
 
 /*
   return and possibly log an NDR error
 */
-_PUBLIC_ NTSTATUS ndr_push_error(struct ndr_push *ndr, enum ndr_err_code err, const char *format, ...)  _PRINTF_ATTRIBUTE(3,4)
+_PUBLIC_ NTSTATUS ndr_push_error(struct ndr_push *ndr,
+				 enum ndr_err_code ndr_err,
+				 const char *format, ...)  _PRINTF_ATTRIBUTE(3,4)
 {
 	char *s=NULL;
 	va_list ap;
@@ -361,11 +364,11 @@
 	vasprintf(&s, format, ap);
 	va_end(ap);
 
-	DEBUG(3,("ndr_push_error(%u): %s\n", err, s));
+	DEBUG(3,("ndr_push_error(%u): %s\n", ndr_err, s));
 
 	free(s);
 
-	return ndr_map_error(err);
+	return ndr_map_error(ndr_err);
 }
 
 /*