Browse Source

Merge branch 'jc/maint-fnmatch-old-style-definition' into maint

* jc/maint-fnmatch-old-style-definition:
  compat/fnmatch: update old-style definition to ANSI
maint
Junio C Hamano 12 years ago
parent
commit
abf3e84b18
  1. 24
      compat/fnmatch/fnmatch.c

24
compat/fnmatch/fnmatch.c

@ -135,9 +135,9 @@ extern int errno; @@ -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, @@ -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) @@ -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);
}

Loading…
Cancel
Save