From d51048c93b51a6811343d87d9db9c771a4496347 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 19 Mar 2001 05:05:41 +0000 Subject: o Rename "namespace" argument to "attrnamespace" as namespace is a C++ reserved word. Submitted by: jkh Obtained from: TrustedBSD Project --- lib/libc/posix1e/extattr.c | 14 +++++++------- lib/libutil/extattr.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c index 1fcfdbbcdaf46..d315a7f5bef5f 100644 --- a/lib/libc/posix1e/extattr.c +++ b/lib/libc/posix1e/extattr.c @@ -36,10 +36,10 @@ #include int -extattr_namespace_to_string(int namespace, char **string) +extattr_namespace_to_string(int attrnamespace, char **string) { - switch(namespace) { + switch(attrnamespace) { case EXTATTR_NAMESPACE_USER: if (*string != NULL) *string = strdup(EXTATTR_NAMESPACE_USER_STRING); @@ -57,16 +57,16 @@ extattr_namespace_to_string(int namespace, char **string) } int -extattr_string_to_namespace(const char *string, int *namespace) +extattr_string_to_namespace(const char *string, int *attrnamespace) { if (!strcmp(string, EXTATTR_NAMESPACE_USER_STRING)) { - if (namespace != NULL) - *namespace = EXTATTR_NAMESPACE_USER; + if (attrnamespace != NULL) + *attrnamespace = EXTATTR_NAMESPACE_USER; return (0); } else if (!strcmp(string, EXTATTR_NAMESPACE_SYSTEM_STRING)) { - if (namespace != NULL) - *namespace = EXTATTR_NAMESPACE_SYSTEM; + if (attrnamespace != NULL) + *attrnamespace = EXTATTR_NAMESPACE_SYSTEM; return (0); } else { errno = EINVAL; diff --git a/lib/libutil/extattr.c b/lib/libutil/extattr.c index 1fcfdbbcdaf46..d315a7f5bef5f 100644 --- a/lib/libutil/extattr.c +++ b/lib/libutil/extattr.c @@ -36,10 +36,10 @@ #include int -extattr_namespace_to_string(int namespace, char **string) +extattr_namespace_to_string(int attrnamespace, char **string) { - switch(namespace) { + switch(attrnamespace) { case EXTATTR_NAMESPACE_USER: if (*string != NULL) *string = strdup(EXTATTR_NAMESPACE_USER_STRING); @@ -57,16 +57,16 @@ extattr_namespace_to_string(int namespace, char **string) } int -extattr_string_to_namespace(const char *string, int *namespace) +extattr_string_to_namespace(const char *string, int *attrnamespace) { if (!strcmp(string, EXTATTR_NAMESPACE_USER_STRING)) { - if (namespace != NULL) - *namespace = EXTATTR_NAMESPACE_USER; + if (attrnamespace != NULL) + *attrnamespace = EXTATTR_NAMESPACE_USER; return (0); } else if (!strcmp(string, EXTATTR_NAMESPACE_SYSTEM_STRING)) { - if (namespace != NULL) - *namespace = EXTATTR_NAMESPACE_SYSTEM; + if (attrnamespace != NULL) + *attrnamespace = EXTATTR_NAMESPACE_SYSTEM; return (0); } else { errno = EINVAL; -- cgit v1.2.3