Spell flag override correctly, rename flags

The "/* flags = AT_SYMLINK_NOFOLLOW */" comment only works if
it comes AFTER the semicolon in wrapfuncs.in. Who knew? Fix
those. Also rename the "flags" arguments for *setxattr() to
"xflags" to avoid any confusion about the flags variable.

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>

4 files changed, 15 insertions, 15 deletions

diff --git a/ports/linux/xattr/guts/fsetxattr.c b/ports/linux/xattr/guts/fsetxattr.c
index cbed2ea..376cf08 100644
--- a/ports/linux/xattr/guts/fsetxattr.c
+++ b/ports/linux/xattr/guts/fsetxattr.c
@@ -2,10 +2,10 @@
  * Copyright (c) 2014 Wind River Systems; see
  * guts/COPYRIGHT for information.
  *
- * int fsetxattr(int filedes, const char *name, const void *value, size_t size, int flags)
+ * int fsetxattr(int filedes, const char *name, const void *value, size_t size, int xflags)
  *	int rc = -1;
  */
-	rc = shared_setxattr(NULL, filedes, name, value, size, flags);
+	rc = shared_setxattr(NULL, filedes, name, value, size, xflags);
 
 /*	return rc;
  * }
diff --git a/ports/linux/xattr/guts/lsetxattr.c b/ports/linux/xattr/guts/lsetxattr.c
index b167b15..9fe35bc 100644
--- a/ports/linux/xattr/guts/lsetxattr.c
+++ b/ports/linux/xattr/guts/lsetxattr.c
@@ -2,10 +2,10 @@
  * Copyright (c) 2014 Wind River Systems; see
  * guts/COPYRIGHT for information.
  *
- * int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+ * int lsetxattr(const char *path, const char *name, const void *value, size_t size, int xflags)
  *	int rc = -1;
  */
-	rc = shared_setxattr(path, -1, name, value, size, flags);
+	rc = shared_setxattr(path, -1, name, value, size, xflags);
 
 /*	return rc;
  * }
diff --git a/ports/linux/xattr/guts/setxattr.c b/ports/linux/xattr/guts/setxattr.c
index dd85252..bace0d8 100644
--- a/ports/linux/xattr/guts/setxattr.c
+++ b/ports/linux/xattr/guts/setxattr.c
@@ -2,10 +2,10 @@
  * Copyright (c) 2014 Wind River Systems; see
  * guts/COPYRIGHT for information.
  *
- * int setxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+ * int setxattr(const char *path, const char *name, const void *value, size_t size, int xflags)
  *	int rc = -1;
  */
-	rc = shared_setxattr(path, -1, name, value, size, flags);
+	rc = shared_setxattr(path, -1, name, value, size, xflags);
 
 /*	return rc;
  * }
diff --git a/ports/linux/xattr/wrapfuncs.in b/ports/linux/xattr/wrapfuncs.in
index edfc788..c37f78a 100644
--- a/ports/linux/xattr/wrapfuncs.in
+++ b/ports/linux/xattr/wrapfuncs.in
@@ -1,12 +1,12 @@
-ssize_t getxattr(const char *path, const char *name, void *value, size_t size) /* flags=0 */;
-ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size) /* flags=AT_SYMLINK_NOFOLLOW */;
+ssize_t getxattr(const char *path, const char *name, void *value, size_t size); /* flags=0 */
+ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size); /* flags=AT_SYMLINK_NOFOLLOW */
 ssize_t fgetxattr(int filedes, const char *name, void *value, size_t size);
-int setxattr(const char *path, const char *name, const void *value, size_t size, int flags) /* flags=0 */;
-int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags) /* flags=AT_SYMLINK_NOFOLLOW */;
-int fsetxattr(int filedes, const char *name, const void *value, size_t size, int flags);
-ssize_t listxattr(const char *path, char *list, size_t size) /* flags=0 */;
-ssize_t llistxattr(const char *path, char *list, size_t size) /* flags=AT_SYMLINK_NOFOLLOW */;
+int setxattr(const char *path, const char *name, const void *value, size_t size, int xflags); /* flags=0 */
+int lsetxattr(const char *path, const char *name, const void *value, size_t size, int xflags); /* flags=AT_SYMLINK_NOFOLLOW */
+int fsetxattr(int filedes, const char *name, const void *value, size_t size, int xflags);
+ssize_t listxattr(const char *path, char *list, size_t size); /* flags=0 */
+ssize_t llistxattr(const char *path, char *list, size_t size); /* flags=AT_SYMLINK_NOFOLLOW */
 ssize_t flistxattr(int filedes, char *list, size_t size);
-int removexattr(const char *path, const char *name) /* flags=0 */;
-int lremovexattr(const char *path, const char *name) /* flags=AT_SYMLINK_NOFOLLOW */;
+int removexattr(const char *path, const char *name); /* flags=0 */
+int lremovexattr(const char *path, const char *name); /* flags=AT_SYMLINK_NOFOLLOW */
 int fremovexattr(int filedes, const char *name);