summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-22 14:33:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:04 -0500
commit4a3b6ac49f9807b1bf070a788bdb444cf9b58d5c (patch)
tree6c42c3839e5daca5a86691f4be41fee151888a7b /source4
parentb7f5078864186cae4a02d2b8c960b2c4bd3aeb91 (diff)
downloadsamba-4a3b6ac49f9807b1bf070a788bdb444cf9b58d5c.tar.gz
samba-4a3b6ac49f9807b1bf070a788bdb444cf9b58d5c.tar.bz2
samba-4a3b6ac49f9807b1bf070a788bdb444cf9b58d5c.zip
r14642: fix shadow warnings
metze (This used to be commit 09850fd13334667a2a7a7b6ee24fa3379c67825a)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/ndr/ndr.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 68252fbc72..97434f0495 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -310,9 +310,9 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
(*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 @@ static NTSTATUS ndr_map_error(enum ndr_err_code err)
/*
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 @@ _PUBLIC_ NTSTATUS ndr_pull_error(struct ndr_pull *ndr,
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 @@ _PUBLIC_ NTSTATUS ndr_push_error(struct ndr_push *ndr, enum ndr_err_code err, co
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);
}
/*