[PATCH 1/2] maint: rm: remove unused static-inlined functions

[Jim Meyering]

FYI,

>From 05364ffe0d057ac0fbd1d3f2d556132e799ce4e0 Mon Sep 17 00:00:00 2001
From: Joachim Schmitz <address@hidden>
Date: Fri, 20 Jul 2012 14:32:53 +0200
Subject: [PATCH 1/2] maint: rm: remove unused static-inlined functions

* src/remove.c (cache_statted, is_dir_lstat): Remove unused
static-inlined functions.
* THANKS.in: Remove my name from this list, now that (with this
commit) it is included automatically.
Copyright-paperwork-exempt: Yes
---
 THANKS.in    |  1 -
 src/remove.c | 22 ----------------------
 2 files changed, 23 deletions(-)

diff --git a/THANKS.in b/THANKS.in
index 57639d9..dc0b9dd 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -289,7 +289,6 @@ Jesse Thilo                         address@hidden
 Jie Xu                              address@hidden
 Jim Blandy                          address@hidden
 Jim Dennis                          address@hidden
-Joachim Schmitz                     address@hidden
 Joakim Rosqvist                     address@hidden
 Jochen Hein                         address@hidden
 Joe Orton                           address@hidden
diff --git a/src/remove.c b/src/remove.c
index f44a982..42f2063 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -88,13 +88,6 @@ cache_stat_init (struct stat *st)
   return st;
 }

-/* Return true if *ST has been statted.  */
-static inline bool
-cache_statted (struct stat *st)
-{
-  return (st->st_size != -1);
-}
-
 /* Return true if *ST has been statted successfully.  */
 static inline bool
 cache_stat_ok (struct stat *st)
@@ -311,21 +304,6 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
   return RM_OK;
 }

-/* Return true if FILENAME is a directory (and not a symlink to a directory).
-   Otherwise, including the case in which lstat fails, return false.
-   *ST is FILENAME's tstatus.
-   Do not modify errno.  */
-static inline bool
-is_dir_lstat (int fd_cwd, char const *filename, struct stat *st)
-{
-  int saved_errno = errno;
-  bool is_dir =
-    (cache_fstatat (fd_cwd, filename, st, AT_SYMLINK_NOFOLLOW) == 0
-     && S_ISDIR (st->st_mode));
-  errno = saved_errno;
-  return is_dir;
-}
-
 /* Return true if FILENAME is a non-directory.
    Otherwise, including the case in which lstat fails, return false.
    *ST is FILENAME's tstatus.
--
1.7.11.2.194.g7bdb748


>From f173180a96cf497682274436781febcf4c86f974 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 20 Jul 2012 15:10:12 +0200
Subject: [PATCH 2/2] maint: adjust exemption to track renamed test script

* cfg.mk (exclude_file_name_regexp--sc_file_system): Sync this
exemption regexp to match renamed tests/df/df-P.  This avoids
a "make syntax-check" failure.
---
 cfg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfg.mk b/cfg.mk
index 790238c..f780511 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -467,7 +467,7 @@ exclude_file_name_regexp--sc_prohibit_always-defined_macros 
= \
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/
 exclude_file_name_regexp--sc_program_name = ^(gl/.*|lib/euidaccess-stat)\.c$$
 exclude_file_name_regexp--sc_file_system = \
-  NEWS|^(tests/init\.cfg|src/df\.c|tests/misc/df-P)$$
+  NEWS|^(tests/init\.cfg|src/df\.c|tests/df/df-P)$$
 exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
   ^m4/stat-prog\.m4$$
 exclude_file_name_regexp--sc_prohibit_fail_0 = \
--
1.7.11.2.194.g7bdb748