>From bc7c0f010b3c6c4214e026bf678a62ef92f61a4f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 18 Sep 2018 19:12:06 -0700 Subject: [PATCH 4/4] dfa: use more-informative function name * lib/dfa.c (maybe_disable_superset_dfa): Rename from dfautf8noss. Use change. --- ChangeLog | 4 ++++ lib/dfa.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c4b12c60..fa7a4557d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-09-18 Paul Eggert + dfa: use more-informative function name + * lib/dfa.c (maybe_disable_superset_dfa): + Rename from dfautf8noss. Use change. + dfa: tweak allocation performance * lib/dfa.c (merge_nfa_state, dfaoptimize): Prefer ptrdiff_t for indexes some more. diff --git a/lib/dfa.c b/lib/dfa.c index 59e15195a..760e060c3 100644 --- a/lib/dfa.c +++ b/lib/dfa.c @@ -3483,8 +3483,10 @@ dfa_supported (struct dfa const *d) return true; } +/* Disable use of the superset DFA is it is not likely to help + performance. */ static void -dfautf8noss (struct dfa *d) +maybe_disable_superset_dfa (struct dfa *d) { if (!d->localeinfo.using_utf8) return; @@ -3612,7 +3614,7 @@ dfacomp (char const *s, size_t len, struct dfa *d, bool searchflag) if (dfa_supported (d)) { - dfautf8noss (d); + maybe_disable_superset_dfa (d); dfaanalyze (d, searchflag); } else -- 2.17.1