From 37dffb599de6ad056c686f41881e9967dee4418e Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 17 Apr 2014 05:22:57 +0000 Subject: string.c: rb_str_cat_cstr * string.c (rb_str_cat): make non-buf version main. * string.c (rb_str_cat_cstr): rename from rb_str_cat2. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 3ad5eedbd1..3845430cec 100644 --- a/string.c +++ b/string.c @@ -38,8 +38,10 @@ #undef rb_locale_str_new_cstr #undef rb_str_dup_frozen #undef rb_str_buf_new_cstr +#undef rb_str_buf_cat #undef rb_str_buf_cat2 #undef rb_str_cat2 +#undef rb_str_cat_cstr static VALUE rb_str_clear(VALUE str); @@ -2048,7 +2050,7 @@ str_buf_cat(VALUE str, const char *ptr, long len) #define str_buf_cat2(str, ptr) str_buf_cat((str), (ptr), strlen(ptr)) VALUE -rb_str_buf_cat(VALUE str, const char *ptr, long len) +rb_str_cat(VALUE str, const char *ptr, long len) { if (len == 0) return str; if (len < 0) { @@ -2058,13 +2060,14 @@ rb_str_buf_cat(VALUE str, const char *ptr, long len) } VALUE -rb_str_buf_cat2(VALUE str, const char *ptr) +rb_str_cat_cstr(VALUE str, const char *ptr) { return rb_str_buf_cat(str, ptr, strlen(ptr)); } -RUBY_ALIAS_FUNCTION(rb_str_cat(VALUE str, const char *ptr, long len), rb_str_buf_cat, (str, ptr, len)) -RUBY_ALIAS_FUNCTION(rb_str_cat2(VALUE str, const char *ptr), rb_str_buf_cat2, (str, ptr)) +RUBY_ALIAS_FUNCTION(rb_str_buf_cat(VALUE str, const char *ptr, long len), rb_str_cat, (str, ptr, len)) +RUBY_ALIAS_FUNCTION(rb_str_buf_cat2(VALUE str, const char *ptr), rb_str_cat_cstr, (str, ptr)) +RUBY_ALIAS_FUNCTION(rb_str_cat2(VALUE str, const char *ptr), rb_str_cat_cstr, (str, ptr)) static VALUE rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, -- cgit v1.2.3