diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2019-02-01 10:09:22 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2019-02-01 10:09:22 +0200 |
| commit | 67ba4ceb06ca36e888c7e7a542244e00ec62a11e (patch) | |
| tree | fa2e7c67f9bbd3b4624fffb433606ec996bda5f2 /support | |
| parent | 820cab16a17baf539888d69887ac637a182809dc (diff) | |
| download | egawk-67ba4ceb06ca36e888c7e7a542244e00ec62a11e.tar.gz egawk-67ba4ceb06ca36e888c7e7a542244e00ec62a11e.tar.bz2 egawk-67ba4ceb06ca36e888c7e7a542244e00ec62a11e.zip | |
Sync regexec.c with GNULIB.
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/regexec.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 3ec1b1ce..c42ba401 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2019-02-01 Arnold D. Robbins <arnold@skeeve.com> + + * regexec.c (proceed_next_node): Sync with GNULIB. + 2019-01-28 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am, regexec.c: Update copyright year. diff --git a/support/regexec.c b/support/regexec.c index 35c7f715..084b1222 100644 --- a/support/regexec.c +++ b/support/regexec.c @@ -189,7 +189,7 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len); We return 0 if we find a match and REG_NOMATCH if not. */ int -regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string, +regexec (const regex_t *__restrict preg, const char *__restrict string, size_t nmatch, regmatch_t pmatch[], int eflags) { reg_errcode_t err; @@ -232,8 +232,8 @@ __typeof__ (__regexec) __compat_regexec; int attribute_compat_text_section -__compat_regexec (const regex_t *_Restrict_ preg, - const char *_Restrict_ string, size_t nmatch, +__compat_regexec (const regex_t *__restrict preg, + const char *__restrict string, size_t nmatch, regmatch_t pmatch[], int eflags) { return regexec (preg, string, nmatch, pmatch, @@ -2209,7 +2209,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, dfa->nexts[node_idx])) /* The node can't accept the "multi byte", or the destination was already thrown away, then the node - could't accept the current input "multi byte". */ + couldn't accept the current input "multi byte". */ naccepted = 0; /* Otherwise, it is sure that the node could accept 'naccepted' bytes input. */ |