Rename API mrb_str_cat2() to mrb_str_cat_cstr(). This is for naming...

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

@@ -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

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;

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));
 }