From b41bd5bc83b23f62f6f0815d20ed1e1185c58086 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 31 Aug 2017 18:25:55 +0200 Subject: [PATCH] posix: Remove internal_function attribute --- ChangeLog | 69 ++++++++++++ posix/fnmatch.c | 6 -- posix/fnmatch_loop.c | 11 +- posix/regcomp.c | 9 +- posix/regex_internal.c | 59 +++++----- posix/regex_internal.h | 29 ++--- posix/regexec.c | 209 +++++++++++++----------------------- posix/spawn_int.h | 2 +- posix/spawn_valid_fd.c | 1 - posix/wordexp.c | 32 +----- sysdeps/posix/ttyname.c | 3 +- sysdeps/posix/ttyname_r.c | 3 +- sysdeps/unix/sysv/linux/preadv.c | 4 +- sysdeps/unix/sysv/linux/preadv64.c | 4 +- sysdeps/unix/sysv/linux/pwritev.c | 4 +- sysdeps/unix/sysv/linux/pwritev64.c | 4 +- sysdeps/unix/sysv/linux/ttyname.c | 6 +- sysdeps/unix/sysv/linux/ttyname_r.c | 4 +- 18 files changed, 198 insertions(+), 261 deletions(-) diff --git a/ChangeLog b/ChangeLog index c83315ae3d..9ca31d04f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,74 @@ 2017-08-31 Florian Weimer + * posix/fnmatch.c (internal_function): Remove definition. + * posix/fnmatch_loop.c (FCT, EXT, END): Remove internal_function. + * posix/regcomp.c (peek_token, init_word_char) + (duplicate_node_closure, fetch_token, peek_token) + (peek_token_bracket, build_range_exp, build_collating_symbol): + Likewise. + * posix/regex_internal.c (re_string_construct_common) + (create_ci_newstate, create_cd_newstate, re_string_allocate) + (re_string_construct, re_string_realloc_buffers, build_wcs_buffer) + (build_wcs_upper_buffer, re_string_skip_chars, build_upper_buffer) + (re_string_translate_buffer, re_string_reconstruct) + (re_string_peek_byte_case, re_string_fetch_byte_case) + (re_string_destruct, re_string_context_at, re_node_set_alloc) + (re_node_set_init_1, re_node_set_init_2, re_node_set_init_copy) + (re_node_set_add_intersect, re_node_set_init_union) + (re_node_set_merge, re_node_set_insert, re_node_set_insert_last) + (re_node_set_compare, re_node_set_contains, re_node_set_remove_at) + (re_dfa_add_node, calc_state_hash, re_acquire_state) + (re_acquire_state_context): Likewise. + * posix/regex_internal.h (internal_function): Remove definition. + (re_string_realloc_buffers, build_wcs_buffer) + (build_wcs_upper_buffer, build_upper_buffer) + (re_string_translate_buffer, re_string_context_at) + (re_string_char_size_at, re_string_wchar_at) + (re_string_elem_size_at): Likewise. + * posix/regexec.c (match_ctx_init, match_ctx_clean) + (match_ctx_free, match_ctx_add_entry, search_cur_bkref_entry) + (match_ctx_add_subtop, match_ctx_add_sublast, sift_ctx_init) + (re_search_internal, re_search_2_stub, re_search_stub) + (re_copy_regs, prune_impossible_nodes, check_matching) + (check_halt_state_context, update_regs, push_fail_stack, set_regs) + (free_fail_stack_return, sift_states_iter_mb) + (sift_states_backward, build_sifted_states) + (update_cur_sifted_state, add_epsilon_src_nodes, check_dst_limits) + (check_dst_limits_calc_pos_1, check_dst_limits_calc_pos) + (check_subexp_limits, sift_states_bkref, merge_state_array) + (find_recover_state, transit_state, merge_state_with_log) + (check_subexp_matching_top, transit_state_sb, transit_state_sb) + (transit_state_mb, transit_state_bkref, get_subexp) + (get_subexp_sub, find_subexp_node, check_arrival) + (check_arrival_add_next_nodes, check_arrival_expand_ecl) + (check_arrival_expand_ecl_sub, expand_bkref_cache, build_trtable) + (check_node_accept_bytes, find_collation_sequence_value) + (group_nodes_into_DFAstates, check_node_accept, extend_buffers) + (acquire_init_state_context, check_halt_node_context) + (proceed_next_node, pop_fail_stack, clean_state_log_if_needed) + (sub_epsilon_src_nodes): Likewise. + * posix/spawn_int.h (__spawn_valid_fd): Likewise. + * posix/spawn_valid_fd (__spawn_valid_fd): Likewise. + * posix/wordexp.c (parse_dollars, parse_backtick, parse_dquote) + (eval_expr, w_addmem, w_addstr, w_addword, parse_backslash) + (parse_qtd_backslash, parse_tilde, do_parse_glob, parse_glob) + (parse_squote, eval_expr_val, eval_expr_multdiv, parse_arith) + (exec_comm_child, exec_comm, parse_comm, parse_param): Likewise. + * sysdeps/posix/ttyname.c (getttyname): Likewise. + * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. + * sysdeps/unix/sysv/linux/preadv.c (__atomic_preadv_replacement) + (PREADV): Likewise. + * sysdeps/unix/sysv/linux/preadv64.c (__atomic_preadv64_replacement) + (PREADV): Likewise. + * sysdeps/unix/sysv/linux/pwritev.c (__atomic_pwritev_replacement) + (PWRITEV): Likewise. + * sysdeps/unix/sysv/linux/pwritev64.c (__atomic_pwritev64_replacement) + (PWRITEV): Likewise. + * sysdeps/unix/sysv/linux/ttyname.c (getttyname): Likewise. + * sysdeps/unix/sysv/linux/ttyname_r.c (getttyname_r): Likewise. + +2017-08-31 Florian Weimer + * nptl/allocatestack.c (change_stack_perm, __deallocate_stack) (setxid_mark_thread, setxid_unmark_thread, setxid_signal_thread): Remove internal_function. diff --git a/posix/fnmatch.c b/posix/fnmatch.c index 441a41f0a5..62df3ece46 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -186,12 +186,6 @@ __wcschrnul (const wchar_t *s, wint_t c) } # endif -# ifndef internal_function -/* Inside GNU libc we mark some function in a special way. In other - environments simply ignore the marking. */ -# define internal_function -# endif - /* Note that this evaluates C many times. */ # ifdef _LIBC # define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c)) diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c index 2500dce615..e90ee46e01 100644 --- a/posix/fnmatch_loop.c +++ b/posix/fnmatch_loop.c @@ -28,16 +28,13 @@ struct STRUCT it matches, nonzero if not. */ static int FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, int no_leading_period, int flags, - struct STRUCT *ends, size_t alloca_used) - internal_function; + struct STRUCT *ends, size_t alloca_used); static int EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, int no_leading_period, int flags, - size_t alloca_used) - internal_function; -static const CHAR *END (const CHAR *patternp) internal_function; + size_t alloca_used); +static const CHAR *END (const CHAR *patternp); static int -internal_function FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, int no_leading_period, int flags, struct STRUCT *ends, size_t alloca_used) { @@ -1000,7 +997,6 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, static const CHAR * -internal_function END (const CHAR *pattern) { const CHAR *p = pattern; @@ -1044,7 +1040,6 @@ END (const CHAR *pattern) static int -internal_function EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, int no_leading_period, int flags, size_t alloca_used) { diff --git a/posix/regcomp.c b/posix/regcomp.c index b724ee3389..a5b46139a9 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -61,7 +61,7 @@ static reg_errcode_t calc_inveclosure (re_dfa_t *dfa); static int fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax); static int peek_token (re_token_t *token, re_string_t *input, - reg_syntax_t syntax) internal_function; + reg_syntax_t syntax); static bin_tree_t *parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax, reg_errcode_t *err); static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg, @@ -916,7 +916,6 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) character used by some operators like "\<", "\>", etc. */ static void -internal_function init_word_char (re_dfa_t *dfa) { dfa->word_ops_used = 1; @@ -1460,7 +1459,6 @@ link_nfa_nodes (void *extra, bin_tree_t *node) to their own constraint. */ static reg_errcode_t -internal_function duplicate_node_closure (re_dfa_t *dfa, int top_org_node, int top_clone_node, int root_node, unsigned int init_constraint) { @@ -1749,7 +1747,6 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root) We must not use this function inside bracket expressions. */ static void -internal_function fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax) { re_string_skip_bytes (input, peek_token (result, input, syntax)); @@ -1759,7 +1756,6 @@ fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax) We must not use this function inside bracket expressions. */ static int -internal_function peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax) { unsigned char c; @@ -1998,7 +1994,6 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax) We must not use this function out of bracket expressions. */ static int -internal_function peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) { unsigned char c; @@ -2626,7 +2621,6 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, update it. */ static reg_errcode_t -internal_function # ifdef RE_ENABLE_I18N build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, bracket_elem_t *start_elem, bracket_elem_t *end_elem) @@ -2747,7 +2741,6 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem, pointer argument since we may update it. */ static reg_errcode_t -internal_function # ifdef RE_ENABLE_I18N build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, int *coll_sym_alloc, const unsigned char *name) diff --git a/posix/regex_internal.c b/posix/regex_internal.c index efafd173b3..111231c198 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -20,14 +20,14 @@ static void re_string_construct_common (const char *str, int len, re_string_t *pstr, RE_TRANSLATE_TYPE trans, int icase, - const re_dfa_t *dfa) internal_function; + const re_dfa_t *dfa); static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, - unsigned int hash) internal_function; + unsigned int hash); static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context, - unsigned int hash) internal_function; + unsigned int hash); /* Functions for string operation. */ @@ -35,7 +35,7 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa, re_string_reconstruct before using the object. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_allocate (re_string_t *pstr, const char *str, int len, int init_len, RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa) { @@ -63,7 +63,7 @@ re_string_allocate (re_string_t *pstr, const char *str, int len, int init_len, /* This function allocate the buffers, and initialize them. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_construct (re_string_t *pstr, const char *str, int len, RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa) { @@ -126,7 +126,7 @@ re_string_construct (re_string_t *pstr, const char *str, int len, /* Helper functions for re_string_allocate, and re_string_construct. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_realloc_buffers (re_string_t *pstr, int new_buf_len) { #ifdef RE_ENABLE_I18N @@ -166,7 +166,6 @@ re_string_realloc_buffers (re_string_t *pstr, int new_buf_len) static void -internal_function re_string_construct_common (const char *str, int len, re_string_t *pstr, RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa) @@ -198,7 +197,6 @@ re_string_construct_common (const char *str, int len, re_string_t *pstr, built and starts from PSTR->VALID_LEN. */ static void -internal_function build_wcs_buffer (re_string_t *pstr) { #ifdef _LIBC @@ -267,7 +265,7 @@ build_wcs_buffer (re_string_t *pstr) but for REG_ICASE. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ build_wcs_upper_buffer (re_string_t *pstr) { mbstate_t prev_st; @@ -486,7 +484,6 @@ build_wcs_upper_buffer (re_string_t *pstr) Return the index. */ static int -internal_function re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc) { mbstate_t prev_st; @@ -527,7 +524,6 @@ re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc) This function is used in case of REG_ICASE. */ static void -internal_function build_upper_buffer (re_string_t *pstr) { int char_idx, end_idx; @@ -550,7 +546,6 @@ build_upper_buffer (re_string_t *pstr) /* Apply TRANS to the buffer in PSTR. */ static void -internal_function re_string_translate_buffer (re_string_t *pstr) { int buf_idx, end_idx; @@ -571,7 +566,7 @@ re_string_translate_buffer (re_string_t *pstr) convert to upper case in case of REG_ICASE, apply translation. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) { int offset = idx - pstr->raw_mbs_idx; @@ -831,7 +826,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) } static unsigned char -internal_function __attribute ((pure)) +__attribute ((pure)) re_string_peek_byte_case (const re_string_t *pstr, int idx) { int ch, off; @@ -867,7 +862,6 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) } static unsigned char -internal_function re_string_fetch_byte_case (re_string_t *pstr) { if (BE (!pstr->mbs_allocated, 1)) @@ -904,7 +898,6 @@ re_string_fetch_byte_case (re_string_t *pstr) } static void -internal_function re_string_destruct (re_string_t *pstr) { #ifdef RE_ENABLE_I18N @@ -918,7 +911,6 @@ re_string_destruct (re_string_t *pstr) /* Return the context at IDX in INPUT. */ static unsigned int -internal_function re_string_context_at (const re_string_t *input, int idx, int eflags) { int c; @@ -963,7 +955,7 @@ re_string_context_at (const re_string_t *input, int idx, int eflags) /* Functions for set operation. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_alloc (re_node_set *set, int size) { set->alloc = size; @@ -975,7 +967,7 @@ re_node_set_alloc (re_node_set *set, int size) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_1 (re_node_set *set, int elem) { set->alloc = 1; @@ -991,7 +983,7 @@ re_node_set_init_1 (re_node_set *set, int elem) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_2 (re_node_set *set, int elem1, int elem2) { set->alloc = 2; @@ -1021,7 +1013,7 @@ re_node_set_init_2 (re_node_set *set, int elem1, int elem2) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_copy (re_node_set *dest, const re_node_set *src) { dest->nelem = src->nelem; @@ -1046,7 +1038,7 @@ re_node_set_init_copy (re_node_set *dest, const re_node_set *src) Note: We assume dest->elems is NULL, when dest->alloc is 0. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1, const re_node_set *src2) { @@ -1137,7 +1129,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1, DEST. Return value indicate the error code or REG_NOERROR if succeeded. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_init_union (re_node_set *dest, const re_node_set *src1, const re_node_set *src2) { @@ -1190,7 +1182,7 @@ re_node_set_init_union (re_node_set *dest, const re_node_set *src1, DEST. Return value indicate the error code or REG_NOERROR if succeeded. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_merge (re_node_set *dest, const re_node_set *src) { int is, id, sbase, delta; @@ -1273,7 +1265,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) return -1 if an error is occured, return 1 otherwise. */ static int -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_insert (re_node_set *set, int elem) { int idx; @@ -1330,7 +1322,7 @@ re_node_set_insert (re_node_set *set, int elem) Return -1 if an error is occured, return 1 otherwise. */ static int -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_node_set_insert_last (re_node_set *set, int elem) { /* Realloc if we need. */ @@ -1353,7 +1345,7 @@ re_node_set_insert_last (re_node_set *set, int elem) return 1 if SET1 and SET2 are equivalent, return 0 otherwise. */ static int -internal_function __attribute ((pure)) +__attribute ((pure)) re_node_set_compare (const re_node_set *set1, const re_node_set *set2) { int i; @@ -1368,7 +1360,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2) /* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */ static int -internal_function __attribute ((pure)) +__attribute ((pure)) re_node_set_contains (const re_node_set *set, int elem) { unsigned int idx, right, mid; @@ -1390,7 +1382,6 @@ re_node_set_contains (const re_node_set *set, int elem) } static void -internal_function re_node_set_remove_at (re_node_set *set, int idx) { if (idx < 0 || idx >= set->nelem) @@ -1405,7 +1396,6 @@ re_node_set_remove_at (re_node_set *set, int idx) Or return -1, if an error will be occured. */ static int -internal_function re_dfa_add_node (re_dfa_t *dfa, re_token_t token) { int type = token.type; @@ -1453,7 +1443,6 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token) } static inline unsigned int -internal_function calc_state_hash (const re_node_set *nodes, unsigned int context) { unsigned int hash = nodes->nelem + context; @@ -1473,7 +1462,7 @@ calc_state_hash (const re_node_set *nodes, unsigned int context) optimization. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa, const re_node_set *nodes) { @@ -1517,7 +1506,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa, optimization. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context) { @@ -1609,7 +1598,7 @@ free_state (re_dfastate_t *state) Return the new state if succeeded, otherwise return NULL. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, unsigned int hash) { @@ -1659,7 +1648,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, Return the new state if succeeded, otherwise return NULL. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, unsigned int context, unsigned int hash) { diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 04317128b7..fef1d35e55 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -373,28 +373,17 @@ typedef struct re_string_t re_string_t; struct re_dfa_t; typedef struct re_dfa_t re_dfa_t; -#ifndef _LIBC -# ifdef __i386__ -# define internal_function __attribute__ ((regparm (3), stdcall)) -# else -# define internal_function -# endif -#endif - #if IS_IN (libc) static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, - int new_buf_len) - internal_function; + int new_buf_len); # ifdef RE_ENABLE_I18N -static void build_wcs_buffer (re_string_t *pstr) internal_function; -static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) - internal_function; +static void build_wcs_buffer (re_string_t *pstr); +static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr); # endif /* RE_ENABLE_I18N */ -static void build_upper_buffer (re_string_t *pstr) internal_function; -static void re_string_translate_buffer (re_string_t *pstr) internal_function; +static void build_upper_buffer (re_string_t *pstr); +static void re_string_translate_buffer (re_string_t *pstr); static unsigned int re_string_context_at (const re_string_t *input, int idx, - int eflags) - internal_function __attribute__ ((pure)); + int eflags) __attribute__ ((pure)); #endif #define re_string_peek_byte(pstr, offset) \ ((pstr)->mbs[(pstr)->cur_idx + offset]) @@ -710,7 +699,7 @@ bitset_mask (bitset_t dest, const bitset_t src) #ifdef RE_ENABLE_I18N /* Inline functions for re_string. */ static int -internal_function __attribute__ ((pure, unused)) +__attribute__ ((pure, unused)) re_string_char_size_at (const re_string_t *pstr, int idx) { int byte_idx; @@ -723,7 +712,7 @@ re_string_char_size_at (const re_string_t *pstr, int idx) } static wint_t -internal_function __attribute__ ((pure, unused)) +__attribute__ ((pure, unused)) re_string_wchar_at (const re_string_t *pstr, int idx) { if (pstr->mb_cur_max == 1) @@ -737,7 +726,7 @@ re_string_wchar_at (const re_string_t *pstr, int idx) # endif static int -internal_function __attribute__ ((pure, unused)) +__attribute__ ((pure, unused)) re_string_elem_size_at (const re_string_t *pstr, int idx) { # ifdef _LIBC diff --git a/posix/regexec.c b/posix/regexec.c index 8eb09dcfa0..f46b1f71ca 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -20,187 +20,159 @@ #include static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - int n) internal_function; -static void match_ctx_clean (re_match_context_t *mctx) internal_function; -static void match_ctx_free (re_match_context_t *cache) internal_function; + int n); +static void match_ctx_clean (re_match_context_t *mctx); +static void match_ctx_free (re_match_context_t *cache); static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, int node, - int str_idx, int from, int to) - internal_function; -static int search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx) - internal_function; + int str_idx, int from, int to); +static int search_cur_bkref_entry (const re_match_context_t *mctx, + int str_idx); static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, int node, - int str_idx) internal_function; + int str_idx); static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop, - int node, int str_idx) - internal_function; + int node, int str_idx); static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts, re_dfastate_t **limited_sts, int last_node, - int last_str_idx) - internal_function; + int last_str_idx); static reg_errcode_t 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) internal_function; + int eflags); static int 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) internal_function; + int stop, int ret_len); static int re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length, int start, int range, int stop, struct re_registers *regs, - int ret_len) internal_function; + int ret_len); static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, - int nregs, int regs_allocated) internal_function; -static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx) - internal_function; + int nregs, int regs_allocated); +static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx); static int check_matching (re_match_context_t *mctx, int fl_longest_match, - int *p_match_first) internal_function; + int *p_match_first); static int check_halt_state_context (const re_match_context_t *mctx, - const re_dfastate_t *state, int idx) - internal_function; + const re_dfastate_t *state, int idx); static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, regmatch_t *prev_idx_match, int cur_node, - int cur_idx, int nmatch) internal_function; + int cur_idx, int nmatch); static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node, int nregs, regmatch_t *regs, - re_node_set *eps_via_nodes) - internal_function; + re_node_set *eps_via_nodes); static reg_errcode_t set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, regmatch_t *pmatch, - int fl_backtrack) internal_function; -static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs) - internal_function; + int fl_backtrack); +static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs); #ifdef RE_ENABLE_I18N static int sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, - int node_idx, int str_idx, int max_str_idx) - internal_function; + int node_idx, int str_idx, int max_str_idx); #endif /* RE_ENABLE_I18N */ static reg_errcode_t sift_states_backward (const re_match_context_t *mctx, - re_sift_context_t *sctx) - internal_function; + re_sift_context_t *sctx); static reg_errcode_t build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, int str_idx, - re_node_set *cur_dest) - internal_function; + re_node_set *cur_dest); static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx, re_sift_context_t *sctx, int str_idx, - re_node_set *dest_nodes) - internal_function; + re_node_set *dest_nodes); static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, - const re_node_set *candidates) - internal_function; + const re_node_set *candidates); static int check_dst_limits (const re_match_context_t *mctx, re_node_set *limits, int dst_node, int dst_idx, int src_node, - int src_idx) internal_function; + int src_idx); static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, int subexp_idx, - int from_node, int bkref_idx) - internal_function; + int from_node, int bkref_idx); static int check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit, int subexp_idx, int node, int str_idx, - int bkref_idx) internal_function; + int bkref_idx); static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates, re_node_set *limits, struct re_backref_cache_entry *bkref_ents, - int str_idx) internal_function; + int str_idx); static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, - int str_idx, const re_node_set *candidates) - internal_function; + int str_idx, + const re_node_set *candidates); static reg_errcode_t merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, - re_dfastate_t **src, int num) - internal_function; + re_dfastate_t **src, int num); static re_dfastate_t *find_recover_state (reg_errcode_t *err, - re_match_context_t *mctx) internal_function; + re_match_context_t *mctx); static re_dfastate_t *transit_state (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *state) internal_function; + re_dfastate_t *state); static re_dfastate_t *merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *next_state) - internal_function; + re_dfastate_t *next_state); static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes, - int str_idx) internal_function; + int str_idx); #if 0 static re_dfastate_t *transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *pstate) - internal_function; + re_dfastate_t *pstate); #endif #ifdef RE_ENABLE_I18N static reg_errcode_t transit_state_mb (re_match_context_t *mctx, - re_dfastate_t *pstate) - internal_function; + re_dfastate_t *pstate); #endif /* RE_ENABLE_I18N */ static reg_errcode_t transit_state_bkref (re_match_context_t *mctx, - const re_node_set *nodes) - internal_function; + const re_node_set *nodes); static reg_errcode_t get_subexp (re_match_context_t *mctx, - int bkref_node, int bkref_str_idx) - internal_function; + int bkref_node, int bkref_str_idx); static reg_errcode_t get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, re_sub_match_last_t *sub_last, - int bkref_node, int bkref_str) - internal_function; + int bkref_node, int bkref_str); static int find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, - int subexp_idx, int type) internal_function; + int subexp_idx, int type); static reg_errcode_t check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node, int top_str, int last_node, int last_str, - int type) internal_function; + int type); static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx, re_node_set *cur_nodes, - re_node_set *next_nodes) - internal_function; + re_node_set *next_nodes); static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, - int ex_subexp, int type) - internal_function; + int ex_subexp, int type); static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, int target, int ex_subexp, - int type) internal_function; + int type); static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, int cur_str, - int subexp_num, int type) - internal_function; -static int build_trtable (const re_dfa_t *dfa, - re_dfastate_t *state) internal_function; + int subexp_num, int type); +static int build_trtable (const re_dfa_t *dfa, re_dfastate_t *state); #ifdef RE_ENABLE_I18N static int check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, - const re_string_t *input, int idx) - internal_function; + const re_string_t *input, int idx); # ifdef _LIBC static unsigned int find_collation_sequence_value (const unsigned char *mbs, - size_t name_len) - internal_function; + size_t name_len); # endif /* _LIBC */ #endif /* RE_ENABLE_I18N */ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, re_node_set *states_node, - bitset_t *states_ch) internal_function; + bitset_t *states_ch); static int check_node_accept (const re_match_context_t *mctx, - const re_token_t *node, int idx) - internal_function; -static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) - internal_function; + const re_token_t *node, int idx); +static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len); /* Entry point for POSIX code. */ @@ -345,7 +317,6 @@ weak_alias (__re_search_2, re_search_2) #endif static int -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, @@ -391,7 +362,6 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, otherwise the position of the match is returned. */ static int -internal_function re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length, int start, int range, int stop, struct re_registers *regs, int ret_len) @@ -479,7 +449,6 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length, } static unsigned -internal_function re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) { @@ -605,7 +574,7 @@ re_exec (const char *s) (START + RANGE >= 0 && START + RANGE <= LENGTH) */ static reg_errcode_t -__attribute_warn_unused_result__ internal_function +__attribute_warn_unused_result__ 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) @@ -928,7 +897,7 @@ re_search_internal (const regex_t *preg, const char *string, int length, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; @@ -1024,7 +993,7 @@ prune_impossible_nodes (re_match_context_t *mctx) since initial states may have constraints like "\<", "^", etc.. */ static inline re_dfastate_t * -__attribute ((always_inline)) internal_function +__attribute ((always_inline)) acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, int idx) { @@ -1066,7 +1035,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, index of the buffer. */ static int -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_matching (re_match_context_t *mctx, int fl_longest_match, int *p_match_first) { @@ -1199,7 +1168,6 @@ check_matching (re_match_context_t *mctx, int fl_longest_match, /* Check NODE match the current context. */ static int -internal_function check_halt_node_context (const re_dfa_t *dfa, int node, unsigned int context) { re_token_type_t type = dfa->nodes[node].type; @@ -1218,7 +1186,6 @@ check_halt_node_context (const re_dfa_t *dfa, int node, unsigned int context) match the context, return the node. */ static int -internal_function check_halt_state_context (const re_match_context_t *mctx, const re_dfastate_t *state, int idx) { @@ -1240,7 +1207,6 @@ check_halt_state_context (const re_match_context_t *mctx, of errors. */ static int -internal_function proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs, int *pidx, int node, re_node_set *eps_via_nodes, struct re_fail_stack_t *fs) @@ -1340,7 +1306,7 @@ proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node, int nregs, regmatch_t *regs, re_node_set *eps_via_nodes) { @@ -1367,7 +1333,6 @@ push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node, } static int -internal_function pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs, regmatch_t *regs, re_node_set *eps_via_nodes) { @@ -1387,7 +1352,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs, pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, regmatch_t *pmatch, int fl_backtrack) { @@ -1494,7 +1459,6 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, } static reg_errcode_t -internal_function free_fail_stack_return (struct re_fail_stack_t *fs) { if (fs) @@ -1511,7 +1475,6 @@ free_fail_stack_return (struct re_fail_stack_t *fs) } static void -internal_function update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, regmatch_t *prev_idx_match, int cur_node, int cur_idx, int nmatch) { @@ -1583,7 +1546,6 @@ update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, ((state) != NULL && re_node_set_contains (&(state)->nodes, node)) static reg_errcode_t -internal_function sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx) { reg_errcode_t err; @@ -1641,7 +1603,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx) } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, int str_idx, re_node_set *cur_dest) { @@ -1703,7 +1665,6 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, /* Helper functions. */ static reg_errcode_t -internal_function clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) { int top = mctx->state_log_top; @@ -1729,7 +1690,6 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) } static reg_errcode_t -internal_function merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, re_dfastate_t **src, int num) { @@ -1756,7 +1716,6 @@ merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, } static reg_errcode_t -internal_function update_cur_sifted_state (const re_match_context_t *mctx, re_sift_context_t *sctx, int str_idx, re_node_set *dest_nodes) @@ -1804,7 +1763,7 @@ update_cur_sifted_state (const re_match_context_t *mctx, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates) { @@ -1833,7 +1792,6 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, } static reg_errcode_t -internal_function sub_epsilon_src_nodes (const re_dfa_t *dfa, int node, re_node_set *dest_nodes, const re_node_set *candidates) { @@ -1882,7 +1840,6 @@ sub_epsilon_src_nodes (const re_dfa_t *dfa, int node, re_node_set *dest_nodes, } static int -internal_function check_dst_limits (const re_match_context_t *mctx, re_node_set *limits, int dst_node, int dst_idx, int src_node, int src_idx) { @@ -1918,7 +1875,6 @@ check_dst_limits (const re_match_context_t *mctx, re_node_set *limits, } static int -internal_function check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, int subexp_idx, int from_node, int bkref_idx) { @@ -1999,7 +1955,6 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, } static int -internal_function check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit, int subexp_idx, int from_node, int str_idx, int bkref_idx) @@ -2029,7 +1984,6 @@ check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit, which are against limitations from DEST_NODES. */ static reg_errcode_t -internal_function check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, const re_node_set *candidates, re_node_set *limits, struct re_backref_cache_entry *bkref_ents, int str_idx) @@ -2117,7 +2071,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, } static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, int str_idx, const re_node_set *candidates) { @@ -2217,7 +2171,6 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, #ifdef RE_ENABLE_I18N static int -internal_function sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, int node_idx, int str_idx, int max_str_idx) { @@ -2247,7 +2200,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, update the destination of STATE_LOG. */ static re_dfastate_t * -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ transit_state (reg_errcode_t *err, re_match_context_t *mctx, re_dfastate_t *state) { @@ -2305,7 +2258,6 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx, /* Update the state_log if we need */ re_dfastate_t * -internal_function merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, re_dfastate_t *next_state) { @@ -2384,7 +2336,6 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, multi-byte match, then look in the log for a state from which to restart matching. */ re_dfastate_t * -internal_function find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) { re_dfastate_t *cur_state; @@ -2415,7 +2366,6 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) correspoding back references. */ static reg_errcode_t -internal_function check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes, int str_idx) { @@ -2488,7 +2438,6 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx, #ifdef RE_ENABLE_I18N static reg_errcode_t -internal_function transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) { const re_dfa_t *const dfa = mctx->dfa; @@ -2558,7 +2507,6 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) #endif /* RE_ENABLE_I18N */ static reg_errcode_t -internal_function transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) { const re_dfa_t *const dfa = mctx->dfa; @@ -2672,7 +2620,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) delay these checking for prune_impossible_nodes(). */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) { const re_dfa_t *const dfa = mctx->dfa; @@ -2821,7 +2769,6 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) and SUB_LAST. */ static reg_errcode_t -internal_function get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, re_sub_match_last_t *sub_last, int bkref_node, int bkref_str) { @@ -2850,7 +2797,6 @@ get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, E.g. RE: (a){2} */ static int -internal_function find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, int subexp_idx, int type) { @@ -2872,7 +2818,7 @@ find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node, int top_str, int last_node, int last_str, int type) { @@ -3033,7 +2979,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node, Can't we unify them? */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx, re_node_set *cur_nodes, re_node_set *next_nodes) { @@ -3112,7 +3058,6 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx, */ static reg_errcode_t -internal_function check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, int ex_subexp, int type) { @@ -3165,7 +3110,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, problematic append it to DST_NODES. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, int target, int ex_subexp, int type) { @@ -3209,7 +3154,7 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, in MCTX->BKREF_ENTS. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, int cur_str, int subexp_num, int type) { @@ -3298,7 +3243,6 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, Return 1 if succeeded, otherwise return NULL. */ static int -internal_function build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) { reg_errcode_t err; @@ -3534,7 +3478,6 @@ out_free: to DEST_CH[i]. This function return the number of destinations. */ static int -internal_function group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, re_node_set *dests_node, bitset_t *dests_ch) { @@ -3728,7 +3671,6 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, # endif static int -internal_function check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, const re_string_t *input, int str_idx) { @@ -3966,7 +3908,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, # ifdef _LIBC static unsigned int -internal_function find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) { uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); @@ -4029,7 +3970,6 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) byte of the INPUT. */ static int -internal_function check_node_accept (const re_match_context_t *mctx, const re_token_t *node, int idx) { @@ -4079,7 +4019,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, /* Extend the buffers, if the buffers have run out. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ extend_buffers (re_match_context_t *mctx, int min_len) { reg_errcode_t ret; @@ -4144,7 +4084,7 @@ extend_buffers (re_match_context_t *mctx, int min_len) /* Initialize MCTX. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ match_ctx_init (re_match_context_t *mctx, int eflags, int n) { mctx->eflags = eflags; @@ -4172,7 +4112,6 @@ match_ctx_init (re_match_context_t *mctx, int eflags, int n) of the input, or changes the input string. */ static void -internal_function match_ctx_clean (re_match_context_t *mctx) { int st_idx; @@ -4202,7 +4141,6 @@ match_ctx_clean (re_match_context_t *mctx) /* Free all the memory associated with MCTX. */ static void -internal_function match_ctx_free (re_match_context_t *mctx) { /* First, free all the memory associated with MCTX->SUB_TOPS. */ @@ -4217,7 +4155,7 @@ match_ctx_free (re_match_context_t *mctx) */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ match_ctx_add_entry (re_match_context_t *mctx, int node, int str_idx, int from, int to) { @@ -4266,7 +4204,6 @@ match_ctx_add_entry (re_match_context_t *mctx, int node, int str_idx, int from, found. Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX. */ static int -internal_function search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx) { int left, right, mid, last; @@ -4289,7 +4226,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx) at STR_IDX. */ static reg_errcode_t -internal_function __attribute_warn_unused_result__ +__attribute_warn_unused_result__ match_ctx_add_subtop (re_match_context_t *mctx, int node, int str_idx) { #ifdef DEBUG @@ -4319,7 +4256,6 @@ match_ctx_add_subtop (re_match_context_t *mctx, int node, int str_idx) at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP. */ static re_sub_match_last_t * -internal_function match_ctx_add_sublast (re_sub_match_top_t *subtop, int node, int str_idx) { re_sub_match_last_t *new_entry; @@ -4346,7 +4282,6 @@ match_ctx_add_sublast (re_sub_match_top_t *subtop, int node, int str_idx) } static void -internal_function sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts, re_dfastate_t **limited_sts, int last_node, int last_str_idx) { diff --git a/posix/spawn_int.h b/posix/spawn_int.h index c60eb948bb..6ada827f55 100644 --- a/posix/spawn_int.h +++ b/posix/spawn_int.h @@ -66,6 +66,6 @@ extern int __spawni (pid_t *pid, const char *path, /* Return true if FD falls into the range valid for file descriptors. The check in this form is mandated by POSIX. */ -bool __spawn_valid_fd (int fd) internal_function attribute_hidden; +bool __spawn_valid_fd (int fd) attribute_hidden; #endif /* _SPAWN_INT_H */ diff --git a/posix/spawn_valid_fd.c b/posix/spawn_valid_fd.c index eacabfc56d..6e1db5ac10 100644 --- a/posix/spawn_valid_fd.c +++ b/posix/spawn_valid_fd.c @@ -21,7 +21,6 @@ #include bool -internal_function __spawn_valid_fd (int fd) { long maxfd = __sysconf (_SC_OPEN_MAX); diff --git a/posix/wordexp.c b/posix/wordexp.c index dfc41736e6..e4cfce9460 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -64,19 +64,16 @@ extern char **__libc_argv attribute_hidden; static int parse_dollars (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, - const char *ifs_white, int quoted) - internal_function; + const char *ifs_white, int quoted); static int parse_backtick (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, - const char *ifs, const char *ifs_white) - internal_function; + const char *ifs, const char *ifs_white); static int parse_dquote (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, - const char *ifs_white) - internal_function; -static int eval_expr (char *expr, long int *result) internal_function; + const char *ifs_white); +static int eval_expr (char *expr, long int *result); /* The w_*() functions manipulate word lists. */ @@ -117,7 +114,6 @@ w_addchar (char *buffer, size_t *actlen, size_t *maxlen, char ch) } static char * -internal_function w_addmem (char *buffer, size_t *actlen, size_t *maxlen, const char *str, size_t len) { @@ -144,7 +140,6 @@ w_addmem (char *buffer, size_t *actlen, size_t *maxlen, const char *str, } static char * -internal_function w_addstr (char *buffer, size_t *actlen, size_t *maxlen, const char *str) /* (lengths exclude trailing zero) */ { @@ -159,7 +154,6 @@ w_addstr (char *buffer, size_t *actlen, size_t *maxlen, const char *str) } static int -internal_function w_addword (wordexp_t *pwordexp, char *word) { /* Add a word to the wordlist */ @@ -200,7 +194,6 @@ no_space: */ static int -internal_function parse_backslash (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset) { @@ -229,7 +222,6 @@ parse_backslash (char **word, size_t *word_length, size_t *max_length, } static int -internal_function parse_qtd_backslash (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset) { @@ -272,7 +264,6 @@ parse_qtd_backslash (char **word, size_t *word_length, size_t *max_length, } static int -internal_function parse_tilde (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, size_t wordc) { @@ -379,7 +370,6 @@ parse_tilde (char **word, size_t *word_length, size_t *max_length, static int -internal_function do_parse_glob (const char *glob_word, char **word, size_t *word_length, size_t *max_length, wordexp_t *pwordexp, const char *ifs, const char *ifs_white) @@ -436,7 +426,6 @@ do_parse_glob (const char *glob_word, char **word, size_t *word_length, } static int -internal_function parse_glob (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, const char *ifs_white) @@ -532,7 +521,6 @@ tidy_up: } static int -internal_function parse_squote (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset) { @@ -554,7 +542,6 @@ parse_squote (char **word, size_t *word_length, size_t *max_length, /* Functions to evaluate an arithmetic expression */ static int -internal_function eval_expr_val (char **expr, long int *result) { char *digit; @@ -589,7 +576,6 @@ eval_expr_val (char **expr, long int *result) } static int -internal_function eval_expr_multdiv (char **expr, long int *result) { long int arg; @@ -630,7 +616,6 @@ eval_expr_multdiv (char **expr, long int *result) } static int -internal_function eval_expr (char *expr, long int *result) { long int arg; @@ -667,7 +652,6 @@ eval_expr (char *expr, long int *result) } static int -internal_function parse_arith (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, int bracket) { @@ -817,7 +801,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length, /* Function called by child process in exec_comm() */ static inline void -internal_function __attribute__ ((always_inline)) +__attribute__ ((always_inline)) exec_comm_child (char *comm, int *fildes, int showerr, int noexec) { const char *args[4] = { _PATH_BSHELL, "-c", comm, NULL }; @@ -875,7 +859,6 @@ exec_comm_child (char *comm, int *fildes, int showerr, int noexec) /* Function to execute a command and retrieve the results */ /* pwordexp contains NULL if field-splitting is forbidden */ static int -internal_function exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length, int flags, wordexp_t *pwordexp, const char *ifs, const char *ifs_white) @@ -1109,7 +1092,6 @@ no_space: } static int -internal_function parse_comm (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, const char *ifs_white) @@ -1197,7 +1179,6 @@ parse_comm (char **word, size_t *word_length, size_t *max_length, (memchr (char_set "", ch, sizeof (char_set) - 1) != NULL) static int -internal_function parse_param (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, const char *ifs_white, int quoted) @@ -2026,7 +2007,6 @@ do_error: #undef CHAR_IN_SET static int -internal_function parse_dollars (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, const char *ifs_white, @@ -2085,7 +2065,6 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length, } static int -internal_function parse_backtick (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char *ifs, const char *ifs_white) @@ -2149,7 +2128,6 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length, } static int -internal_function parse_dquote (char **word, size_t *word_length, size_t *max_length, const char *words, size_t *offset, int flags, wordexp_t *pwordexp, const char * ifs, const char * ifs_white) diff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c index 288e22b307..b7497f3976 100644 --- a/sysdeps/posix/ttyname.c +++ b/sysdeps/posix/ttyname.c @@ -28,13 +28,12 @@ char *__ttyname; static char *getttyname (int fd, dev_t mydev, ino_t myino, - int save, int *dostat) internal_function; + int save, int *dostat); libc_freeres_ptr (static char *getttyname_name); static char * -internal_function getttyname (int fd, dev_t mydev, ino_t myino, int save, int *dostat) { static const char dev[] = "/dev"; diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c index 56bf18e4bc..2d10bf65d6 100644 --- a/sysdeps/posix/ttyname_r.c +++ b/sysdeps/posix/ttyname_r.c @@ -33,10 +33,9 @@ static const char dev[] = "/dev"; static int getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino, int save, - int *dostat) __THROW internal_function; + int *dostat) __THROW; static int -internal_function getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino, int save, int *dostat) { diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c index ecabc8c9c6..d03ce8dc5c 100644 --- a/sysdeps/unix/sysv/linux/preadv.c +++ b/sysdeps/unix/sysv/linux/preadv.c @@ -33,7 +33,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset) } # else static ssize_t __atomic_preadv_replacement (int, const struct iovec *, - int, off_t) internal_function; + int, off_t); ssize_t preadv (int fd, const struct iovec *vector, int count, off_t offset) { @@ -45,7 +45,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset) # endif return __atomic_preadv_replacement (fd, vector, count, offset); } -# define PREADV static internal_function __atomic_preadv_replacement +# define PREADV static __atomic_preadv_replacement # define PREAD __pread # define OFF_T off_t # include diff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c index c96b2142e3..00997da99c 100644 --- a/sysdeps/unix/sysv/linux/preadv64.c +++ b/sysdeps/unix/sysv/linux/preadv64.c @@ -31,7 +31,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) } #else static ssize_t __atomic_preadv64_replacement (int, const struct iovec *, - int, off64_t) internal_function; + int, off64_t); ssize_t preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) { @@ -43,7 +43,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) #endif return __atomic_preadv64_replacement (fd, vector, count, offset); } -# define PREADV static internal_function __atomic_preadv64_replacement +# define PREADV static __atomic_preadv64_replacement # define PREAD __pread64 # define OFF_T off64_t # include diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index 7545cb3e1e..cfe65068ae 100644 --- a/sysdeps/unix/sysv/linux/pwritev.c +++ b/sysdeps/unix/sysv/linux/pwritev.c @@ -33,7 +33,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset) } # else static ssize_t __atomic_pwritev_replacement (int, const struct iovec *, - int, off_t) internal_function; + int, off_t); ssize_t pwritev (int fd, const struct iovec *vector, int count, off_t offset) { @@ -45,7 +45,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset) # endif return __atomic_pwritev_replacement (fd, vector, count, offset); } -# define PWRITEV static internal_function __atomic_pwritev_replacement +# define PWRITEV static __atomic_pwritev_replacement # define PWRITE __pwrite # define OFF_T off_t # include diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c index 9dc4e55f96..a7cec4e144 100644 --- a/sysdeps/unix/sysv/linux/pwritev64.c +++ b/sysdeps/unix/sysv/linux/pwritev64.c @@ -31,7 +31,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) } #else static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, - int, off64_t) internal_function; + int, off64_t); ssize_t pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) { @@ -43,7 +43,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) #endif return __atomic_pwritev64_replacement (fd, vector, count, offset); } -# define PWRITEV static internal_function __atomic_pwritev64_replacement +# define PWRITEV static __atomic_pwritev64_replacement # define PWRITE __pwrite64 # define OFF_T off64_t # include diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 5909cb765f..116cf350e5 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -36,14 +36,12 @@ char *__ttyname; #endif static char *getttyname (const char *dev, dev_t mydev, - ino64_t myino, int save, int *dostat) - internal_function; - + ino64_t myino, int save, int *dostat); libc_freeres_ptr (static char *getttyname_name); static char * -internal_function attribute_compat_text_section +attribute_compat_text_section getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat) { static size_t namelen; diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c index dc863526ba..18f35ef2b7 100644 --- a/sysdeps/unix/sysv/linux/ttyname_r.c +++ b/sysdeps/unix/sysv/linux/ttyname_r.c @@ -32,10 +32,10 @@ static int getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino, int save, - int *dostat) internal_function; + int *dostat); static int -internal_function attribute_compat_text_section +attribute_compat_text_section getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino, int save, int *dostat) { -- 2.11.4.GIT