From 96fc1bb1495bb1b417391f54b725f7cd3d5dcc2f Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Wed, 10 Sep 2008 18:33:32 +0000 Subject: 25638: remove unnecessary ternary expression in match_str. --- ChangeLog | 3 +++ Src/Zle/compmatch.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 976013bda..c7749ba10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-09-10 Clint Adams + * 25638: Src/Zle/compmatch.c: remove unnecessary ternary expression + in match_str. + * 25637: Src/exec.c: dereference prog after the NULL check. 2008-09-08 Clint Adams diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 9bef1cfeb..836dcdd45 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -562,7 +562,7 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, wexact += 1 + bslash; if (!test) while (bp && bc >= (useqbr ? bp->qpos : bp->pos)) { - bp->curpos = matchbufadded + (sfx ? (ow - w) : (w - ow)) + obc; + bp->curpos = matchbufadded + (w - ow) + obc; bp = bp->next; } lm = NULL; -- cgit 1.4.1