diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | dfa.c | 14 |
2 files changed, 12 insertions, 8 deletions
@@ -1,4 +1,4 @@ -2016-07-17 Arnold D. Robbins <arnold@skeeve.com> +2016-07-18 Arnold D. Robbins <arnold@skeeve.com> * main.c (locale_dir): New variable, init to LOCALEDIR (set by configure). @@ -10,6 +10,10 @@ locale debugging, call set_locale_stuff again if arg parsing changed the locale. + Unrelated: + + * dfa.c: Sync with GNU grep. + 2016-07-17 Arnold D. Robbins <arnold@skeeve.com> * eval.c (set_LINT): Reset lintfunc to `warning' for LINT="invalid". @@ -1981,7 +1981,7 @@ dfaparse (char const *s, size_t len, struct dfa *d) /* Copy one set to another. */ static void -copy (position_set const *src, position_set * dst) +copy (position_set const *src, position_set *dst) { if (dst->alloc < src->nelem) { @@ -1994,7 +1994,7 @@ copy (position_set const *src, position_set * dst) } static void -alloc_position_set (position_set * s, size_t size) +alloc_position_set (position_set *s, size_t size) { s->elems = xnmalloc (size, sizeof *s->elems); s->alloc = size; @@ -2006,7 +2006,7 @@ alloc_position_set (position_set * s, size_t size) then merge (logically-OR) P's constraints into the one in S. S->elems must point to an array large enough to hold the resulting set. */ static void -insert (position p, position_set * s) +insert (position p, position_set *s) { size_t count = s->nelem; size_t lo = 0, hi = count; @@ -2036,7 +2036,7 @@ insert (position p, position_set * s) /* Merge two sets of positions into a third. The result is exactly as if the positions of both sets were inserted into an initially empty set. */ static void -merge (position_set const *s1, position_set const *s2, position_set * m) +merge (position_set const *s1, position_set const *s2, position_set *m) { size_t i = 0, j = 0; @@ -2065,7 +2065,7 @@ merge (position_set const *s1, position_set const *s2, position_set * m) /* Delete a position from a set. */ static void -delete (position p, position_set * s) +delete (position p, position_set *s) { size_t i; @@ -2644,8 +2644,8 @@ dfastate (state_num s, struct dfa *d, state_num trans[]) prtok (d->tokens[pos.index]); fprintf (stderr, " of"); for (j = 0; j < NOTCHAR; j++) - if (tstbit (j, matches)) - fprintf (stderr, " 0x%02zx", j); + if (tstbit (j, matches)) + fprintf (stderr, " 0x%02zx", j); fprintf (stderr, "\n"); #endif |