summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-14 17:31:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-14 17:31:14 +0000
commit599076c45f26338e3ec20e545b8fad78aa6abcc9 (patch)
tree9628c96ed5663756a981d1bd27a9e98a20a4b615
parenta7481aae3fc2d9e83dcf548e614209025c09fc83 (diff)
encoding.c: encoding check
* encoding.c (enc_check_encoding): use is_data_encoding() to check type consistently. * encoding.c (must_encoding): return rb_encoding* instead of encoding index. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog14
-rw-r--r--encoding.c10
2 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b3a72bdfcd..2c850a59bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon Jul 15 02:31:12 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (enc_check_encoding): use is_data_encoding() to check
+ type consistently.
+
+ * encoding.c (must_encoding): return rb_encoding* instead of encoding
+ index.
+
+ * encoding.c (enc_check_encoding): use is_data_encoding() to check
+ type consistently.
+
+ * encoding.c (must_encoding): return rb_encoding* instead of encoding
+ index.
+
Mon Jul 15 02:21:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_fill_term): consider old terminator length, and should
diff --git a/encoding.c b/encoding.c
index e1b14dcda5d..ac92b8627c2 100644
--- a/encoding.c
+++ b/encoding.c
@@ -129,13 +129,13 @@ check_encoding(rb_encoding *enc)
static int
enc_check_encoding(VALUE obj)
{
- if (SPECIAL_CONST_P(obj) || !rb_typeddata_is_kind_of(obj, &encoding_data_type)) {
+ if (!is_data_encoding(obj)) {
return -1;
}
return check_encoding(RDATA(obj)->data);
}
-static int
+static rb_encoding *
must_encoding(VALUE enc)
{
int index = enc_check_encoding(enc);
@@ -143,7 +143,7 @@ must_encoding(VALUE enc)
rb_raise(rb_eTypeError, "wrong argument type %s (expected Encoding)",
rb_obj_classname(enc));
}
- return index;
+ return DATA_PTR(enc);
}
static rb_encoding *
@@ -456,7 +456,7 @@ rb_encdb_dummy(const char *name)
static VALUE
enc_dummy_p(VALUE enc)
{
- return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
+ return ENC_DUMMY_P(must_encoding(enc)) ? Qtrue : Qfalse;
}
/*
@@ -472,7 +472,7 @@ enc_dummy_p(VALUE enc)
static VALUE
enc_ascii_compatible_p(VALUE enc)
{
- return rb_enc_asciicompat(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
+ return rb_enc_asciicompat(must_encoding(enc)) ? Qtrue : Qfalse;
}
/*