From c18cd60c4b112056d8971ece20f9c9d4b6bdd837 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Wed, 8 Jan 2025 14:39:11 +0900
Subject: [PATCH] string.h: remove unused flag unset macros

---
 include/mruby/string.h | 10 ----------
 src/string.c           |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/mruby/string.h b/include/mruby/string.h
index 4999c7308..c0b19ab5d 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -57,7 +57,6 @@ struct RStringEmbed {
 
 #define RSTR_EMBED_P(s) ((s)->flags & MRB_STR_EMBED)
 #define RSTR_SET_EMBED_FLAG(s) ((s)->flags |= MRB_STR_EMBED)
-#define RSTR_UNSET_EMBED_FLAG(s) ((s)->flags &= ~(MRB_STR_EMBED|MRB_STR_EMBED_LEN_MASK))
 #define RSTR_SET_EMBED_LEN(s, n) do {\
   size_t tmp_n = (n);\
   (s)->flags &= ~MRB_STR_EMBED_LEN_MASK;\
@@ -81,16 +80,8 @@ struct RStringEmbed {
 #define RSTR_CAPA(s) (RSTR_EMBED_P(s) ? RSTRING_EMBED_LEN_MAX : (s)->as.heap.aux.capa)
 
 #define RSTR_SHARED_P(s) ((s)->flags & MRB_STR_SHARED)
-#define RSTR_SET_SHARED_FLAG(s) ((s)->flags |= MRB_STR_SHARED)
-#define RSTR_UNSET_SHARED_FLAG(s) ((s)->flags &= ~MRB_STR_SHARED)
-
 #define RSTR_FSHARED_P(s) ((s)->flags & MRB_STR_FSHARED)
-#define RSTR_SET_FSHARED_FLAG(s) ((s)->flags |= MRB_STR_FSHARED)
-#define RSTR_UNSET_FSHARED_FLAG(s) ((s)->flags &= ~MRB_STR_FSHARED)
-
 #define RSTR_NOFREE_P(s) ((s)->flags & MRB_STR_NOFREE)
-#define RSTR_SET_NOFREE_FLAG(s) ((s)->flags |= MRB_STR_NOFREE)
-#define RSTR_UNSET_NOFREE_FLAG(s) ((s)->flags &= ~MRB_STR_NOFREE)
 
 #ifdef MRB_UTF8_STRING
 # define RSTR_SINGLE_BYTE_P(s) ((s)->flags & MRB_STR_SINGLE_BYTE)
@@ -107,7 +98,6 @@ struct RStringEmbed {
 #endif
 #define RSTR_SET_ASCII_FLAG(s) RSTR_SET_SINGLE_BYTE_FLAG(s)
 #define RSTR_BINARY_P(s) ((s)->flags & MRB_STR_BINARY)
-#define RSTR_SET_BINARY_FLAG(s) ((s)->flags |= MRB_STR_BINARY)
 
 /**
  * Returns a pointer from a Ruby string
diff --git a/src/string.c b/src/string.c
index bb9402355..3c474d599 100644
--- a/src/string.c
+++ b/src/string.c
@@ -231,7 +231,7 @@ str_unshare_buffer(mrb_state *mrb, struct RString *s)
     if (shared->refcnt == 1 && s->as.heap.ptr == shared->ptr) {
       s->as.heap.aux.capa = shared->capa;
       s->as.heap.ptr[s->as.heap.len] = '\0';
-      RSTR_UNSET_SHARED_FLAG(s);
+      RSTR_SET_TYPE(s, NORMAL);
       mrb_free(mrb, shared);
     }
     else {