From de5660b0479c18f0fd0b246218869c2e5f7e1ca7 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 19 Mar 2001 06:00:41 +0000
Subject: [PATCH] o Rename "namespace" argument to "attrnamespace" as namespace
 is a C++   reserved word.

Submitted by:		jkh
Obtained from:	TrustedBSD Project
---
 usr.sbin/extattrctl/extattrctl.8 | 12 ++++++------
 usr.sbin/extattrctl/extattrctl.c | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/usr.sbin/extattrctl/extattrctl.8 b/usr.sbin/extattrctl/extattrctl.8
index f2de3fd58119..0bc9da22c69f 100644
--- a/usr.sbin/extattrctl/extattrctl.8
+++ b/usr.sbin/extattrctl/extattrctl.8
@@ -47,13 +47,13 @@
 .Nm
 .Cm enable
 .Ar path
-.Ar namespace
+.Ar attrnamespace
 .Ar attrname
 .Ar attrfile
 .Nm
 .Cm disable
 .Ar path
-.Ar namespace
+.Ar attrnamespace
 .Ar attrname
 .Sh DESCRIPTION
 .Nm
@@ -104,11 +104,11 @@ from denying attribute service.
 .Pp
 This file should not exist before running
 .Cm initattr .
-.It Cm enable Ar path namespace attrname attrfile
+.It Cm enable Ar path attrnamespace attrname attrfile
 Enable an attribute named
 .Ar attrname
 in the namespace
-.Ar namespace
+.Ar attrnamespace
 on the file system identified using
 .Ar path ,
 and backed by initialized attribute file
@@ -119,11 +119,11 @@ The backing file must have been initialized using
 before its first use.
 Attributes must have been started on the file system prior to the
 enabling of any attributes.
-.It Cm disable Ar path namespace attrname
+.It Cm disable Ar path attrnamespace attrname
 Disable the attributed named
 .Ar attrname
 in namespace
-.Ar namespace
+.Ar attrnamespace
 on the file system identified by
 .Ar path .
 Available namespaces are "user" and "system".
diff --git a/usr.sbin/extattrctl/extattrctl.c b/usr.sbin/extattrctl/extattrctl.c
index eeaf2cdc046f..c5b60552aae8 100644
--- a/usr.sbin/extattrctl/extattrctl.c
+++ b/usr.sbin/extattrctl/extattrctl.c
@@ -57,8 +57,8 @@ usage(void)
 	    "  extattrctl start [path]\n"
 	    "  extattrctl stop [path]\n"
 	    "  extattrctl initattr [-f] [-p path] [attrsize] [attrfile]\n"
-	    "  extattrctl enable [path] [namespace] [attrname] [attrfile]\n"
-	    "  extattrctl disable [path] [namespace] [attrname]\n");
+	    "  extattrctl enable [path] [attrnamespace] [attrname] [attrfile]\n"
+	    "  extattrctl disable [path] [attrnamespace] [attrname]\n");
 	exit(-1);
 }
 
@@ -159,7 +159,7 @@ initattr(int argc, char *argv[])
 int
 main(int argc, char *argv[])
 {
-	int	error = 0, namespace;
+	int	error = 0, attrnamespace;
 
 	if (argc < 2)
 		usage();
@@ -187,13 +187,13 @@ main(int argc, char *argv[])
 	} else if (!strcmp(argv[1], "enable")) {
 		if (argc != 6)
 			usage();
-		error = extattr_string_to_namespace(argv[3], &namespace);
+		error = extattr_string_to_namespace(argv[3], &attrnamespace);
 		if (error) {
 			perror("extattrctl enable");
 			return (-1);
 		}
 		error = extattrctl(argv[2], UFS_EXTATTR_CMD_ENABLE, argv[5],
-		    namespace, argv[4]);
+		    attrnamespace, argv[4]);
 		if (error) {
 			perror("extattrctl enable");
 			return (-1);
@@ -202,13 +202,13 @@ main(int argc, char *argv[])
 	} else if (!strcmp(argv[1], "disable")) {
 		if (argc != 5)
 			usage();
-		error = extattr_string_to_namespace(argv[3], &namespace);
+		error = extattr_string_to_namespace(argv[3], &attrnamespace);
 		if (error) {
 			perror("extattrctl disable");
 			return (-1);
 		}
 		error = extattrctl(argv[2], UFS_EXTATTR_CMD_DISABLE, NULL,
-		    namespace, argv[4]);
+		    attrnamespace, argv[4]);
 		if (error) {
 			perror("extattrctl disable");
 			return (-1);