undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compat/fnmatch: update old-style definition to ANSI

Browse Source 
We try to avoid touching borrowed code, but we encourage people to
write without old-style definition and compile with -Werror these
days, and on platforms that need to use NO_FNMATCH, these three
functions make the compilation fail.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-12-19 08:54:25 -08:00
parent 086cb91153
commit 38104ca6b9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compat/fnmatch/fnmatch.c
View File

@ -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);
} }