[PATCH 2/6] path: Make the 'get_st_mode_bits' symbol a file static
- From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
- Date
- Apr 27, 2013, 18:42 UTC
- Message-ID
- <517C1BF9.2050604@ramsay1.demon.co.uk>
On MinGW, sparse issues an "'get_st_mode_bits' not declared. Should it be static?" warning. The MinGW and MSVC builds do not see the declaration of this function, within git-compat-util.h, due to it's placement within an preprocessor conditional. (So, one solution would be to simply move the declaration to the top level of the header.)
In order to suppress the warning, since this symbol does not need more than file visibility, we simply remove the declaration from the header and add the static modifier to the function definition.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> --- git-compat-util.h | 1 - path.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h index e955bb5..3a990b3 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -163,7 +163,6 @@ typedef long intptr_t; typedef unsigned long uintptr_t; #endif -int get_st_mode_bits(const char *path, int *mode); #if defined(__CYGWIN__) #undef _XOPEN_SOURCE #include <grp.h> diff --git a/path.c b/path.c index 04ff148..cc2e9ac 100644 --- a/path.c +++ b/path.c @@ -11,7 +11,7 @@ * may return wrong permission bits. Most of the time we do not care, * but the callsites of this wrapper do care. */ -int get_st_mode_bits(const char *path, int *mode) +static int get_st_mode_bits(const char *path, int *mode) { struct stat st; if (lstat(path, &st) < 0)
-- 1.8.2