From bc23a5e9e555f7a0b606856c417b9910ed92af68 Mon Sep 17 00:00:00 2001
From: cremno <cremno@mail.ru>
Date: Mon, 21 Apr 2014 21:24:00 +0200
Subject: remove `mrb_str_buf_cat`

It does the same as `mrb_str_cat`.
---
 src/array.c  |  4 ++--
 src/string.c | 16 ++++------------
 src/vm.c     |  4 ++--
 3 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/array.c b/src/array.c
index eeeef23a5..c8e88e197 100644
--- a/src/array.c
+++ b/src/array.c
@@ -955,7 +955,7 @@ join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list)
 
   for (i=0; i<RARRAY_LEN(ary); i++) {
     if (i > 0 && !mrb_nil_p(sep)) {
-      mrb_str_buf_cat(mrb, result, RSTRING_PTR(sep), RSTRING_LEN(sep));
+      mrb_str_buf_append(mrb, result, sep);
     }
 
     val = RARRAY_PTR(ary)[i];
@@ -967,7 +967,7 @@ join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list)
 
     case MRB_TT_STRING:
     str_join:
-      mrb_str_buf_cat(mrb, result, RSTRING_PTR(val), RSTRING_LEN(val));
+      mrb_str_buf_append(mrb, result, val);
       break;
 
     default:
diff --git a/src/string.c b/src/string.c
index f78564fb8..1e3c7db3a 100644
--- a/src/string.c
+++ b/src/string.c
@@ -277,14 +277,6 @@ str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len)
   STR_PTR(s)[total] = '\0';   /* sentinel */
 }
 
-mrb_value
-mrb_str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len)
-{
-  if (len == 0) return str;
-  str_buf_cat(mrb, mrb_str_ptr(str), ptr, len);
-  return str;
-}
-
 mrb_value
 mrb_str_new(mrb_state *mrb, const char *p, size_t len)
 {
@@ -2518,12 +2510,12 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
       c = *p;
       if (c == '"'|| c == '\\' || (c == '#' && IS_EVSTR(p, pend))) {
           buf[0] = '\\'; buf[1] = c;
-          mrb_str_buf_cat(mrb, result, buf, 2);
+          mrb_str_cat(mrb, result, buf, 2);
           continue;
       }
       if (ISPRINT(c)) {
           buf[0] = c;
-          mrb_str_buf_cat(mrb, result, buf, 1);
+          mrb_str_cat(mrb, result, buf, 1);
           continue;
       }
       switch (c) {
@@ -2540,7 +2532,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
       if (cc) {
           buf[0] = '\\';
           buf[1] = (char)cc;
-          mrb_str_buf_cat(mrb, result, buf, 2);
+          mrb_str_cat(mrb, result, buf, 2);
           continue;
       }
       else {
@@ -2548,7 +2540,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
         buf[3] = '0' + c % 8; c /= 8;
         buf[2] = '0' + c % 8; c /= 8;
         buf[1] = '0' + c % 8;
-        mrb_str_buf_cat(mrb, result, buf, 4);
+        mrb_str_cat(mrb, result, buf, 4);
         continue;
       }
     }
diff --git a/src/vm.c b/src/vm.c
index 320282742..da8c62f51 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -564,8 +564,8 @@ localjump_error(mrb_state *mrb, localjump_error_kind kind)
   mrb_value exc;
 
   msg = mrb_str_buf_new(mrb, sizeof(lead) + 7);
-  mrb_str_buf_cat(mrb, msg, lead, sizeof(lead) - 1);
-  mrb_str_buf_cat(mrb, msg, kind_str[kind], kind_str_len[kind]);
+  mrb_str_cat(mrb, msg, lead, sizeof(lead) - 1);
+  mrb_str_cat(mrb, msg, kind_str[kind], kind_str_len[kind]);
   exc = mrb_exc_new_str(mrb, E_LOCALJUMP_ERROR, msg);
   mrb->exc = mrb_obj_ptr(exc);
 }
-- 
cgit v1.2.3