aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-06-28 00:17:08 +0200
committerRon Yorston <rmy@pobox.com>2017-08-23 12:55:35 +0100
commit8566334a211ca32bc441c99b23eb96182216067b (patch)
treeb2808f08226b57867ad8f8b962d07a6c6ebf770f
parent09c01ce5d0518b51cd6d3114351c967f295878da (diff)
downloadbusybox-w32-8566334a211ca32bc441c99b23eb96182216067b.tar.gz
busybox-w32-8566334a211ca32bc441c99b23eb96182216067b.tar.bz2
busybox-w32-8566334a211ca32bc441c99b23eb96182216067b.zip
win32/fnmatch: avoid old-style function definitions
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Ron Yorston <rmy@pobox.com>
-rw-r--r--win32/fnmatch.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/win32/fnmatch.c b/win32/fnmatch.c
index 1f4ead5f9..74d02078c 100644
--- a/win32/fnmatch.c
+++ b/win32/fnmatch.c
@@ -131,9 +131,7 @@ extern int errno;
131 131
132# if !defined HAVE___STRCHRNUL && !defined _LIBC 132# if !defined HAVE___STRCHRNUL && !defined _LIBC
133static char * 133static char *
134__strchrnul (s, c) 134__strchrnul (const char *s, int c)
135 const char *s;
136 int c;
137{ 135{
138 char *result = strchr (s, c); 136 char *result = strchr (s, c);
139 if (result == NULL) 137 if (result == NULL)
@@ -155,11 +153,8 @@ static int internal_fnmatch __P ((const char *pattern, const char *string,
155 internal_function; 153 internal_function;
156static int 154static int
157internal_function 155internal_function
158internal_fnmatch (pattern, string, no_leading_period, flags) 156internal_fnmatch (const char *pattern, const char *string,
159 const char *pattern; 157 int no_leading_period, int flags)
160 const char *string;
161 int no_leading_period;
162 int flags;
163{ 158{
164 register const char *p = pattern, *n = string; 159 register const char *p = pattern, *n = string;
165 register unsigned char c; 160 register unsigned char c;
@@ -477,10 +472,7 @@ internal_fnmatch (pattern, string, no_leading_period, flags)
477 472
478 473
479int 474int
480fnmatch (pattern, string, flags) 475fnmatch (const char *pattern, const char *string, int flags)
481 const char *pattern;
482 const char *string;
483 int flags;
484{ 476{
485 return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags); 477 return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
486} 478}