From 0cedf8fa02848bc505d7cda29f7266b5e03a9076 Mon Sep 17 00:00:00 2001
From: Masaki Muranaka <monaka@monami-ya.jp>
Date: Sat, 23 Mar 2013 16:29:30 +0900
Subject: Rename API mrb_str_cat2() to mrb_str_cat_cstr(). This is for naming
 orthogonality. mrb_str_cat2() is also left for backward compatibility.

---
 include/mruby/string.h | 8 +++++++-
 src/error.c            | 4 ++--
 src/string.c           | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/mruby/string.h b/include/mruby/string.h
index 613c6c6a7..3dc4094aa 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -56,7 +56,7 @@ char *mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr);
 int mrb_str_offset(mrb_state *mrb, mrb_value str, int pos);
 mrb_value mrb_str_dup(mrb_state *mrb, mrb_value str); /* mrb_str_dup */
 mrb_value mrb_str_intern(mrb_state *mrb, mrb_value self);
-mrb_value mrb_str_cat2(mrb_state *mrb, mrb_value str, const char *ptr);
+mrb_value mrb_str_cat_cstr(mrb_state *, mrb_value, const char *);
 mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, int base, int badcheck);
 double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, int badcheck);
 mrb_value mrb_str_to_str(mrb_state *mrb, mrb_value str);
@@ -71,6 +71,12 @@ mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2);
 int mrb_str_cmp(mrb_state *mrb, mrb_value str1, mrb_value str2);
 char *mrb_str_to_cstr(mrb_state *mrb, mrb_value str);
 
+/* For backward compatibility */
+static inline mrb_value
+mrb_str_cat2(mrb_state *mrb, mrb_value str, const char *ptr) {
+  return mrb_str_cat_cstr(mrb, str, ptr);
+}
+
 #if defined(__cplusplus)
 }  /* extern "C" { */
 #endif
diff --git a/src/error.c b/src/error.c
index 6edff6f03..f46887465 100644
--- a/src/error.c
+++ b/src/error.c
@@ -136,7 +136,7 @@ exc_inspect(mrb_state *mrb, mrb_value exc)
       mrb_str_append(mrb, str, mesg);
       mrb_str_cat(mrb, str, " (", 2);
     }
-    mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
+    mrb_str_cat_cstr(mrb, str, mrb_obj_classname(mrb, exc));
     if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
       mrb_str_cat(mrb, str, ")", 1);
     }
@@ -148,7 +148,7 @@ exc_inspect(mrb_state *mrb, mrb_value exc)
       mrb_str_append(mrb, str, mesg);
     } else {
       mrb_str_cat(mrb, str, ": ", 2);
-      mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
+      mrb_str_cat_cstr(mrb, str, mrb_obj_classname(mrb, exc));
     }
   }
   return str;
diff --git a/src/string.c b/src/string.c
index 97d53cd6c..165cdbccd 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2548,7 +2548,7 @@ mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, mrb_int len)
 }
 
 mrb_value
-mrb_str_cat2(mrb_state *mrb, mrb_value str, const char *ptr)
+mrb_str_cat_cstr(mrb_state *mrb, mrb_value str, const char *ptr)
 {
   return mrb_str_cat(mrb, str, ptr, strlen(ptr));
 }
-- 
cgit v1.2.3