mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/maint-fnmatch-old-style-definition' into maint
* jc/maint-fnmatch-old-style-definition: compat/fnmatch: update old-style definition to ANSI
This commit is contained in:
commit
abf3e84b18
|
@ -135,9 +135,9 @@ extern int errno;
|
||||||
|
|
||||||
# if !defined HAVE___STRCHRNUL && !defined _LIBC
|
# if !defined HAVE___STRCHRNUL && !defined _LIBC
|
||||||
static char *
|
static char *
|
||||||
__strchrnul (s, c)
|
__strchrnul (const char *s, int c)
|
||||||
const char *s;
|
|
||||||
int c;
|
|
||||||
{
|
{
|
||||||
char *result = strchr (s, c);
|
char *result = strchr (s, c);
|
||||||
if (result == NULL)
|
if (result == NULL)
|
||||||
|
@ -159,11 +159,11 @@ static int internal_fnmatch __P ((const char *pattern, const char *string,
|
||||||
internal_function;
|
internal_function;
|
||||||
static int
|
static int
|
||||||
internal_function
|
internal_function
|
||||||
internal_fnmatch (pattern, string, no_leading_period, flags)
|
internal_fnmatch (const char *pattern, const char *string, int no_leading_period, int flags)
|
||||||
const char *pattern;
|
|
||||||
const char *string;
|
|
||||||
int no_leading_period;
|
|
||||||
int flags;
|
|
||||||
{
|
{
|
||||||
register const char *p = pattern, *n = string;
|
register const char *p = pattern, *n = string;
|
||||||
register unsigned char c;
|
register unsigned char c;
|
||||||
|
@ -481,10 +481,10 @@ internal_fnmatch (pattern, string, no_leading_period, flags)
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
fnmatch (pattern, string, flags)
|
fnmatch (const char *pattern, const char *string, int flags)
|
||||||
const char *pattern;
|
|
||||||
const char *string;
|
|
||||||
int flags;
|
|
||||||
{
|
{
|
||||||
return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
|
return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue