diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-01 01:13:21 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-01 01:13:21 +0000 |
commit | d956526a76cd3b5aece69cbb444225c4d46d536e (patch) | |
tree | 125f867424c0e2d8e73c3940076ccc660e2de866 | |
parent | 8663df2f2031e6286cd293415a140c8e685f88cc (diff) | |
download | ruby-d956526a76cd3b5aece69cbb444225c4d46d536e.tar.gz |
string.c: remove old interfaces
* string.c (rb_str_new[2-5], rb_{tainted,usascii}_str_new2),
(rb_str_buf_new2): remove old interfaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/intern.h | 6 | ||||
-rw-r--r-- | string.c | 29 |
3 files changed, 5 insertions, 35 deletions
@@ -1,3 +1,8 @@ +Sat Jun 1 10:13:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_new[2-5], rb_{tainted,usascii}_str_new2), + (rb_str_buf_new2): remove old interfaces. + Sat Jun 1 08:00:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc), diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 5987718e81..a44690e4ab 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -661,16 +661,11 @@ VALUE rb_str_format(int, const VALUE *, VALUE); /* string.c */ VALUE rb_str_new(const char*, long); VALUE rb_str_new_cstr(const char*); -VALUE rb_str_new2(const char*); VALUE rb_str_new_shared(VALUE); -VALUE rb_str_new3(VALUE); VALUE rb_str_new_frozen(VALUE); -VALUE rb_str_new4(VALUE); VALUE rb_str_new_with_class(VALUE, const char*, long); -VALUE rb_str_new5(VALUE, const char*, long); VALUE rb_tainted_str_new_cstr(const char*); VALUE rb_tainted_str_new(const char*, long); -VALUE rb_tainted_str_new2(const char*); VALUE rb_external_str_new(const char*, long); VALUE rb_external_str_new_cstr(const char*); VALUE rb_locale_str_new(const char*, long); @@ -683,7 +678,6 @@ VALUE rb_str_buf_new2(const char*); VALUE rb_str_tmp_new(long); VALUE rb_usascii_str_new(const char*, long); VALUE rb_usascii_str_new_cstr(const char*); -VALUE rb_usascii_str_new2(const char*); void rb_str_free(VALUE); void rb_str_shared_replace(VALUE, VALUE); VALUE rb_str_buf_append(VALUE, VALUE); @@ -38,15 +38,8 @@ #undef rb_usascii_str_new_cstr #undef rb_external_str_new_cstr #undef rb_locale_str_new_cstr -#undef rb_str_new2 -#undef rb_str_new3 -#undef rb_str_new4 -#undef rb_str_new5 -#undef rb_tainted_str_new2 -#undef rb_usascii_str_new2 #undef rb_str_dup_frozen #undef rb_str_buf_new_cstr -#undef rb_str_buf_new2 #undef rb_str_buf_cat2 #undef rb_str_cat2 @@ -458,9 +451,6 @@ rb_str_new_cstr(const char *ptr) return rb_str_new(ptr, strlen(ptr)); } -RUBY_ALIAS_FUNCTION(rb_str_new2(const char *ptr), rb_str_new_cstr, (ptr)) -#define rb_str_new2 rb_str_new_cstr - VALUE rb_usascii_str_new_cstr(const char *ptr) { @@ -469,9 +459,6 @@ rb_usascii_str_new_cstr(const char *ptr) return str; } -RUBY_ALIAS_FUNCTION(rb_usascii_str_new2(const char *ptr), rb_usascii_str_new_cstr, (ptr)) -#define rb_usascii_str_new2 rb_usascii_str_new_cstr - VALUE rb_tainted_str_new(const char *ptr, long len) { @@ -490,9 +477,6 @@ rb_tainted_str_new_cstr(const char *ptr) return str; } -RUBY_ALIAS_FUNCTION(rb_tainted_str_new2(const char *ptr), rb_tainted_str_new_cstr, (ptr)) -#define rb_tainted_str_new2 rb_tainted_str_new_cstr - VALUE rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags, VALUE ecopts) { @@ -688,9 +672,6 @@ rb_str_new_shared(VALUE str) return str2; } -RUBY_ALIAS_FUNCTION(rb_str_new3(VALUE str), rb_str_new_shared, (str)) -#define rb_str_new3 rb_str_new_shared - static VALUE str_new4(VALUE klass, VALUE str) { @@ -754,19 +735,12 @@ rb_str_new_frozen(VALUE orig) return str; } -RUBY_ALIAS_FUNCTION(rb_str_new4(VALUE orig), rb_str_new_frozen, (orig)) -#define rb_str_new4 rb_str_new_frozen - VALUE rb_str_new_with_class(VALUE obj, const char *ptr, long len) { return str_new(rb_obj_class(obj), ptr, len); } -RUBY_ALIAS_FUNCTION(rb_str_new5(VALUE obj, const char *ptr, long len), - rb_str_new_with_class, (obj, ptr, len)) -#define rb_str_new5 rb_str_new_with_class - static VALUE str_new_empty(VALUE str) { @@ -806,9 +780,6 @@ rb_str_buf_new_cstr(const char *ptr) return str; } -RUBY_ALIAS_FUNCTION(rb_str_buf_new2(const char *ptr), rb_str_buf_new_cstr, (ptr)) -#define rb_str_buf_new2 rb_str_buf_new_cstr - VALUE rb_str_tmp_new(long len) { |