wrapper.c: make warn_on_inaccessible() static

After the last patch, this function is not used outside anymore. Keep it
static.

Noticed-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-compat-util.h b/git-compat-util.h
index f74b40181068f4c5876b4be607c0d7ff30f1671f..87f47828a591c5774ddbaa01054159ac6d37236b 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1100,8 +1100,6 @@ int remove_or_warn(unsigned int mode, const char *path);
 int access_or_warn(const char *path, int mode, unsigned flag);
 int access_or_die(const char *path, int mode, unsigned flag);
 
 int access_or_warn(const char *path, int mode, unsigned flag);
 int access_or_die(const char *path, int mode, unsigned flag);
 

-/* Warn on an inaccessible file that ought to be accessible */
-void warn_on_inaccessible(const char *path);

 /* Warn on an inaccessible file if errno indicates this is an error */
 int warn_on_fopen_errors(const char *path);
 
 /* Warn on an inaccessible file if errno indicates this is an error */
 int warn_on_fopen_errors(const char *path);
 

diff --git a/wrapper.c b/wrapper.c
index 6e513c904acea971199cc4434f373010562ab1dd..b117eb14a47ab8f6e3c1424241040f3930367524 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -418,6 +418,11 @@ FILE *fopen_for_writing(const char *path)
        return ret;
 }
 
        return ret;
 }
 

+static void warn_on_inaccessible(const char *path)
+{
+       warning_errno(_("unable to access '%s'"), path);
+}
+

 int warn_on_fopen_errors(const char *path)
 {
        if (errno != ENOENT && errno != ENOTDIR) {
 int warn_on_fopen_errors(const char *path)
 {
        if (errno != ENOENT && errno != ENOTDIR) {


@@ -597,11 +602,6 @@ int remove_or_warn(unsigned int mode, const char *file)
        return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file);
 }
 
        return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file);
 }
 

-void warn_on_inaccessible(const char *path)
-{
-       warning_errno(_("unable to access '%s'"), path);
-}
-

 static int access_error_is_ok(int err, unsigned flag)
 {
        return err == ENOENT || err == ENOTDIR ||
 static int access_error_is_ok(int err, unsigned flag)
 {
        return err == ENOENT || err == ENOTDIR ||