From be5448fd16128d92b73fb17c32e4c729e0b23f06 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Mon, 29 Jan 2024 22:17:04 +0900
Subject: [PATCH] string.c (mrb_memsearch): refactor m==1 (use memchr) case

---
 src/string.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/string.c b/src/string.c
index 380a34c16..1c46a9843 100644
--- a/src/string.c
+++ b/src/string.c
@@ -654,12 +654,10 @@ mrb_memsearch(const char *x0, mrb_int m, const char *y0, mrb_int n)
     return 0;
   }
   else if (m == 1) {
-    const unsigned char *ys = (const unsigned char*)memchr(y, *x, n);
+    const unsigned char *p = (const unsigned char*)memchr(y, *x, n);
 
-    if (ys)
-      return (mrb_int)(ys - y);
-    else
-      return -1;
+    if (p) return (mrb_int)(p - y);
+    return -1;
   }
   return mrb_memsearch_ss((const unsigned char*)x0, m, (const unsigned char*)y0, n);
 }