From 37d65069729432698ee60fd9d80be3830b4ad7fa Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 14 Mar 2022 07:22:01 +0900 Subject: [PATCH] string.c: remove unused API `mrb_str_strlen()`. Compatibility macro is provided for safety. --- include/mruby/string.h | 3 ++- src/string.c | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/include/mruby/string.h b/include/mruby/string.h index 3a8d73a70..b172a3263 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -102,7 +102,6 @@ struct RStringEmbed { #define RSTRING_LEN(s) RSTR_LEN(RSTRING(s)) #define RSTRING_CAPA(s) RSTR_CAPA(RSTRING(s)) #define RSTRING_END(s) (RSTRING_PTR(s) + RSTRING_LEN(s)) -MRB_API mrb_int mrb_str_strlen(mrb_state*, struct RString*); #define RSTRING_CSTR(mrb,s) mrb_string_cstr(mrb, s) #define MRB_STR_SHARED 1 @@ -335,6 +334,8 @@ MRB_API const char *mrb_string_value_cstr(mrb_state *mrb, mrb_value *str); MRB_API const char *mrb_string_value_ptr(mrb_state *mrb, mrb_value str); /* obsolete: use RSTRING_LEN() */ MRB_API mrb_int mrb_string_value_len(mrb_state *mrb, mrb_value str); +/* obsolete: substituted by a macro; shall be removed */ +#define mrb_str_strlen(mrb, s) strlen(RSTR_PTR(s)) /** * Duplicates a string object. diff --git a/src/string.c b/src/string.c index b1dc1e1e5..41d14bd32 100644 --- a/src/string.c +++ b/src/string.c @@ -696,17 +696,6 @@ str_rindex(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int pos) } } -MRB_API mrb_int -mrb_str_strlen(mrb_state *mrb, struct RString *s) -{ - mrb_int max = RSTR_LEN(s); - char *p = RSTR_PTR(s); - - if (!p) return 0; - check_null_byte(mrb, s); - return max; -} - #ifdef _WIN32 #include