fix spuriously slow check in twoway strstr/memmem cores

mem0 && mem && ... is redundant since mem can only be nonzero when
mem0 is nonzero.

diff --git a/src/string/memmem.c b/src/string/memmem.c
index 54a66e466aac1dce4e7312cb30206d4f52d6ab4c..ce3cd190afae6efd84cf4707dbbd181929daab50 100644 (file)
--- a/src/string/memmem.c
+++ b/src/string/memmem.c
@@ -100,7 +100,7 @@ static char *twoway_memmem(const unsigned char *h, const unsigned char *z, const
                if (BITOP(byteset, h[l-1], &)) {
                        k = l-shift[h[l-1]];
                        if (k) {
-                               if (mem0 && mem && k < p) k = l-p;
+                               if (mem && k < p) k = l-p;
                                h += k;
                                mem = 0;
                                continue;

diff --git a/src/string/strstr.c b/src/string/strstr.c
index cd0691275b2e4880853837738a1569ad1d06fc80..c80e9caf6d9deb14241ba0edd9e5a0d0b349bd27 100644 (file)
--- a/src/string/strstr.c
+++ b/src/string/strstr.c
@@ -110,7 +110,7 @@ static char *twoway_strstr(const unsigned char *h, const unsigned char *n)
                        k = l-shift[h[l-1]];
                        //printf("adv by %zu (on %c) at [%s] (%zu;l=%zu)\n", k, h[l-1], h, shift[h[l-1]], l);
                        if (k) {
-                               if (mem0 && mem && k < p) k = l-p;
+                               if (mem && k < p) k = l-p;
                                h += k;
                                mem = 0;
                                continue;