aboutsummaryrefslogtreecommitdiff
path: root/posix/regexec.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-21 11:57:23 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-10-21 11:57:23 +0000
commit85231522bb178ebe0957529de20b7f3dda81168c (patch)
treebc8f29152d304af5604b0b76344d52a73a94804f /posix/regexec.c
parentca88f362a7e5f14db8e6de71f1ce500b2285307c (diff)
downloadglibc-85231522bb178ebe0957529de20b7f3dda81168c.zip
glibc-85231522bb178ebe0957529de20b7f3dda81168c.tar.gz
glibc-85231522bb178ebe0957529de20b7f3dda81168c.tar.bz2
Convert a few more function definitions to prototype style.
This patch converts a few more function definitions in glibc from old-style K&R to prototype style. This is sufficient to build and test on x86_64 and x86 with -Wold-style-definition (I'll test on some more architectures before proposing the actual addition of -Wold-style-definition). Tested for x86_64 and x86 with -Wold-style-definition in use (testsuite - this patch affects files containing assertions). * io/fts.c (fts_open): Convert to prototype-style function definition. * malloc/mcheck.c (mcheck): Likewise. (mcheck_pedantic): Likewise. * posix/regexec.c (re_search_2_stub): Likewise. Use internal_function. (re_search_internal): Likewise. * resolv/res_init.c [RESOLVSORT] (net_mask): Convert to prototype-style function definition. * sunrpc/clnt_udp.c (clntudp_call): Likewise. * sunrpc/pmap_rmt.c (clnt_broadcast): Likewise. * sunrpc/rpcsvc/rusers.x (xdr_utmp): Likewise. (xdr_utmpptr): Likewise. (xdr_utmparr): Likewise. (xdr_utmpidle): Likewise. (xdr_utmpidleptr): Likewise. (xdr_utmpidlearr): Likewise.
Diffstat (limited to 'posix/regexec.c')
-rw-r--r--posix/regexec.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/posix/regexec.c b/posix/regexec.c
index 8699e71..bbc7a98 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -345,12 +345,11 @@ weak_alias (__re_search_2, re_search_2)
#endif
static int
-re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs,
- stop, ret_len)
- struct re_pattern_buffer *bufp;
- const char *string1, *string2;
- int length1, length2, start, range, stop, ret_len;
- struct re_registers *regs;
+internal_function
+re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
+ int length1, const char *string2, int length2, int start,
+ int range, struct re_registers *regs,
+ int stop, int ret_len)
{
const char *str;
int rval;
@@ -606,14 +605,10 @@ re_exec (const char *s)
(START + RANGE >= 0 && START + RANGE <= LENGTH) */
static reg_errcode_t
-__attribute_warn_unused_result__
-re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch,
- eflags)
- const regex_t *preg;
- const char *string;
- int length, start, range, stop, eflags;
- size_t nmatch;
- regmatch_t pmatch[];
+__attribute_warn_unused_result__ internal_function
+re_search_internal (const regex_t *preg, const char *string, int length,
+ int start, int range, int stop, size_t nmatch,
+ regmatch_t pmatch[], int eflags)
{
reg_errcode_t err;
const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;