This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] ftw.h: make gcc -pedantic happy
- From: "Dmitry V. Levin" <ldv at altlinux dot org>
- To: libc-alpha at sourceware dot org
- Date: Fri, 14 Sep 2012 03:13:02 +0400
- Subject: [PATCH] ftw.h: make gcc -pedantic happy
Fix "comma at end of enumerator list" warnings reported by gcc -pedantic.
---
The issue itself is of no importance, but the patch is trivial,
and I'd like to test git push with something simple enough.
ChangeLog | 5 +++++
io/ftw.h | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5d14c4f..110c5a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
+2012-09-13 Dmitry V. Levin <ldv@altlinux.org>
+
+ * io/ftw.h: Do not put commas at the end of enumerator lists to
+ make gcc -pedantic happy.
+
2012-09-13 H.J. Lu <hongjiu.lu@intel.com>
[BZ #14576]
diff --git a/io/ftw.h b/io/ftw.h
index be1aa17..68d54a2 100644
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -39,18 +39,19 @@ enum
FTW_D, /* Directory. */
#define FTW_D FTW_D
FTW_DNR, /* Unreadable directory. */
#define FTW_DNR FTW_DNR
- FTW_NS, /* Unstatable file. */
+ FTW_NS /* Unstatable file. */
#define FTW_NS FTW_NS
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-
- FTW_SL, /* Symbolic link. */
+ ,
+ FTW_SL /* Symbolic link. */
# define FTW_SL FTW_SL
#endif
#ifdef __USE_XOPEN_EXTENDED
+ ,
/* These flags are only passed from the `nftw' function. */
FTW_DP, /* Directory, all subdirs have been visited. */
# define FTW_DP FTW_DP
FTW_SLN /* Symbolic link naming non-existing file. */
@@ -94,9 +95,9 @@ enum
FTW_SKIP_SUBTREE = 2, /* Only meaningful for FTW_D: Don't walk through the
subtree, instead just continue with its next
sibling. */
# define FTW_SKIP_SUBTREE FTW_SKIP_SUBTREE
- FTW_SKIP_SIBLINGS = 3,/* Continue with FTW_DP callback for current directory
+ FTW_SKIP_SIBLINGS = 3 /* Continue with FTW_DP callback for current directory
(if FTW_DEPTH) and then its siblings. */
# define FTW_SKIP_SIBLINGS FTW_SKIP_SIBLINGS
};
#endif
--
ldv