summaryrefslogtreecommitdiffstats
path: root/lib/libc/regex/regexec.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2007-06-11 03:05:54 +0000
committerdelphij <delphij@FreeBSD.org>2007-06-11 03:05:54 +0000
commitf848dcc6bb7ba3884539039e80a8a4f70eb3f23d (patch)
tree5849b25e51eef9dee63d6cd51bae20607313a4be /lib/libc/regex/regexec.c
parentf41f6d7b7eb3329718a2f35c858f6a358db8e242 (diff)
downloadFreeBSD-src-f848dcc6bb7ba3884539039e80a8a4f70eb3f23d.zip
FreeBSD-src-f848dcc6bb7ba3884539039e80a8a4f70eb3f23d.tar.gz
Diff reduction against other *BSDs: ANSIfy function
prototypes. No function changes.
Diffstat (limited to 'lib/libc/regex/regexec.c')
-rw-r--r--lib/libc/regex/regexec.c29
1 files changed, 11 insertions, 18 deletions
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index a6a3c48..1cf87b8 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -62,12 +62,7 @@ __FBSDID("$FreeBSD$");
static int nope __unused = 0; /* for use in asserts; shuts lint up */
static __inline size_t
-xmbrtowc(wi, s, n, mbs, dummy)
-wint_t *wi;
-const char *s;
-size_t n;
-mbstate_t *mbs;
-wint_t dummy;
+xmbrtowc(wint_t *wi, const char *s, size_t n, mbstate_t *mbs, wint_t dummy)
{
size_t nr;
wchar_t wc;
@@ -87,12 +82,11 @@ wint_t dummy;
}
static __inline size_t
-xmbrtowc_dummy(wi, s, n, mbs, dummy)
-wint_t *wi;
-const char *s;
-size_t n __unused;
-mbstate_t *mbs __unused;
-wint_t dummy __unused;
+xmbrtowc_dummy(wint_t *wi,
+ const char *s,
+ size_t n __unused,
+ mbstate_t *mbs __unused,
+ wint_t dummy __unused)
{
if (wi != NULL)
@@ -210,12 +204,11 @@ wint_t dummy __unused;
* have been prototyped.
*/
int /* 0 success, REG_NOMATCH failure */
-regexec(preg, string, nmatch, pmatch, eflags)
-const regex_t * __restrict preg;
-const char * __restrict string;
-size_t nmatch;
-regmatch_t pmatch[__restrict];
-int eflags;
+regexec(const regex_t * __restrict preg,
+ const char * __restrict string,
+ size_t nmatch,
+ regmatch_t pmatch[__restrict],
+ int eflags)
{
struct re_guts *g = preg->re_g;
#ifdef REDEBUG
OpenPOWER on IntegriCloud