* [RFC/PATCH] compat/fnmatch: update old-style definition to ANSI
@ 2012-12-19 17:08 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2012-12-19 17:08 UTC (permalink / raw)
To: git
We usually try to avoid touching borrowed code, but we encourage
people to code without old-style definition these days and compile
with -Werror, 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>
---
compat/fnmatch/fnmatch.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c
index 0ff1d27..b8b7dc2 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);
}
--
1.8.1.rc2.196.g654d69e
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-19 17:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-19 17:08 [RFC/PATCH] compat/fnmatch: update old-style definition to ANSI Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).