diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-09-14 03:38:34 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2016-09-16 03:52:31 +0000 |
| commit | 14989cea4ad5fcf17f4a967a804146acf67c4439 (patch) | |
| tree | ddc205ef648caac696e9f8394dd7f861e04da12b /Src/Zle/compmatch.c | |
| parent | 2656b8c2936a4847eac96537f7e04b2d599cd880 (diff) | |
| download | zsh-14989cea4ad5fcf17f4a967a804146acf67c4439.tar.gz zsh-14989cea4ad5fcf17f4a967a804146acf67c4439.zip | |
39310/0002: internals: match_str: Simplify by removing 'zoff'.
'zoff' was only used within 'if (sfx)' blocks, in which case it was initialized
to 'alen', so simply s/zoff/alen/g. 'alen' is not const but it first changes
on line 794, after the last use of 'zoff'.
Diffstat (limited to 'Src/Zle/compmatch.c')
| -rw-r--r-- | Src/Zle/compmatch.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 183eb6803..82cda6128 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -623,9 +623,9 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, */ int alen; /* - * ### These two are related: they're set symmetrically. + * ### Related to 'zoff', which was removed in 2016. */ - int zoff, moff; + int moff; /* * ### These two are related. */ @@ -665,14 +665,14 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, continue; if (mp->flags & CMF_LEFT) { - ap = mp->left; zoff = 0; moff = alen; aop = mp->right; + ap = mp->left; moff = alen; aop = mp->right; if (sfx) { both = 0; loff = -llen; aoff = -(llen + alen); } else { both = 1; loff = alen; aoff = 0; } } else { - ap = mp->right; zoff = alen; moff = 0; aop = mp->left; + ap = mp->right; moff = 0; aop = mp->left; if (sfx) { both = 1; loff = -(llen + alen); aoff = -alen; } else { @@ -698,8 +698,8 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, /* Fine, now we call ourselves recursively to find the * string matched by the `*'. */ - if (sfx && (savl = l[-(llen + zoff)])) - l[-(llen + zoff)] = '\0'; + if (sfx && (savl = l[-(llen + alen)])) + l[-(llen + alen)] = '\0'; for (t = 0, tp = w, ct = 0, ict = lw - alen + 1; ict; tp += add, ct++, ict--) { @@ -721,12 +721,12 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, !match_parts(l + aoff , tp - moff, alen, part)) break; if (sfx) { - if ((savw = tp[-zoff])) - tp[-zoff] = '\0'; + if ((savw = tp[-alen])) + tp[-alen] = '\0'; t = match_str(l - ll, w - lw, NULL, 0, NULL, 1, 2, part); if (savw) - tp[-zoff] = savw; + tp[-alen] = savw; } else t = match_str(l + llen + moff, tp + moff, NULL, 0, NULL, 0, 1, part); @@ -736,7 +736,7 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, } ict = ct; if (sfx && savl) - l[-(llen + zoff)] = savl; + l[-(llen + alen)] = savl; /* Have we found a position in w where the rest of l * matches? */ |