diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-08 11:17:05 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 11:17:05 -0800 |
commit | abf3e84b185524aa7903337846578b1486a52758 (patch) | |
tree | 3b0d034ecd1d61293fa516d41e66079c11f5423e /compat | |
parent | 9e3d58a3337de05c8e118f8fc8c7f03b98ec62bd (diff) | |
parent | 38104ca6b98180efc6bdb6a56c1fcc3910e29d68 (diff) | |
download | git-abf3e84b185524aa7903337846578b1486a52758.tar.gz git-abf3e84b185524aa7903337846578b1486a52758.tar.xz |
Merge branch 'jc/maint-fnmatch-old-style-definition' into maint
* jc/maint-fnmatch-old-style-definition:
compat/fnmatch: update old-style definition to ANSI
Diffstat (limited to 'compat')
-rw-r--r-- | compat/fnmatch/fnmatch.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c index 0ff1d273a..b8b7dc254 100644 --- a/compat/fnmatch/fnmatch.c +++ b/compat/fnmatch/fnmatch.c @@ -135,9 +135,9 @@ extern int errno; # if !defined HAVE___STRCHRNUL && !defined _LIBC static char * -__strchrnul (s, c) - const char *s; - int c; +__strchrnul (const char *s, int c) + + { char *result = strchr (s, c); if (result == NULL) @@ -159,11 +159,11 @@ static int internal_fnmatch __P ((const char *pattern, const char *string, internal_function; static int internal_function -internal_fnmatch (pattern, string, no_leading_period, flags) - const char *pattern; - const char *string; - int no_leading_period; - int flags; +internal_fnmatch (const char *pattern, const char *string, int no_leading_period, int flags) + + + + { register const char *p = pattern, *n = string; register unsigned char c; @@ -481,10 +481,10 @@ internal_fnmatch (pattern, string, no_leading_period, flags) int -fnmatch (pattern, string, flags) - const char *pattern; - const char *string; - int flags; +fnmatch (const char *pattern, const char *string, int flags) + + + { return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags); } |