From 787439455ce2188037ee6d8a0fb4cc28a9e1a887 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 10 Jan 2024 17:31:04 +0900 Subject: [PATCH] string.c: remove the macro BYTES_ALIGN_CHECK which is no longer used --- src/string.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/string.c b/src/string.c index a972caba6..14f6433c4 100644 --- a/src/string.c +++ b/src/string.c @@ -444,15 +444,13 @@ str_index_str_by_char(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int pos) return str_index_str_by_char_search(mrb, p, pend, s, slen, off); } -#define BYTES_ALIGN_CHECK(pos) if (pos < 0) return mrb_nil_value(); #else #define RSTRING_CHAR_LEN(s) RSTRING_LEN(s) #define chars2bytes(s, off, ci) (ci) #define bytes2chars(s, bi) (bi) #define char_adjust(beg, end, ptr) (ptr) #define char_backtrack(ptr, end) ((end) - 1) -#define BYTES_ALIGN_CHECK(pos) -#define str_index_str_by_char(mrb, str, sub, pos) str_index_str(mrb, str, sub, pos) +#define str_index_str_by_char(mrb, str, sub, pos) str_index_str((mrb), (str), (sub), (pos)) #endif #ifndef MRB_QS_SHORT_STRING_LENGTH @@ -489,7 +487,7 @@ mrb_memsearch_qs(const unsigned char *xs, mrb_int m, const unsigned char *ys, mr qstable[*x] = xe - x; /* Searching */ - for (; y + m <= ys + n; y += *(qstable + y[m])) { + for (; y + m <= ys + n; y += qstable[y[m]]) { if (*xs == *y && memcmp(xs, y, m) == 0) return (mrb_int)(y - ys); }