Prefer rb_ary_new4() over rb_ary_new3().

[ruby-eet.git] / ext / ext.c

diff --git a/ext/ext.c b/ext/ext.c
index 44c6ed5167e5b5fbcbdfb8b69df861a3feec6609..ea620be810658fcf541a5753c73abe1872daffaa 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -26,9 +26,9 @@
 #include <st.h>
 #include <locale.h>
 
-#define CHECK_KEY(key) \
+#define CHECK_NO_BIN0(key) \
        if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \
-               rb_raise (rb_eArgError, "key must not contain binary zeroes");
+               rb_raise (rb_eArgError, #key " must not contain binary zeroes");
 
 #define CHECK_CLOSED(ef) \
        if (!*(ef)) \
@@ -261,7 +261,7 @@ c_delete (VALUE self, VALUE key)
        CHECK_CLOSED (ef);
 
        ckey = StringValuePtr (key);
-       CHECK_KEY (key);
+       CHECK_NO_BIN0 (key);
 
        if (!eet_delete (*ef, ckey))
                rb_raise (rb_eIOError, "cannot delete entry - %s", ckey);
@@ -290,7 +290,7 @@ c_read (VALUE self, VALUE key)
        CHECK_CLOSED (ef);
 
        ckey = StringValuePtr (key);
-       CHECK_KEY (key);
+       CHECK_NO_BIN0 (key);
 
        data = eet_read (*ef, ckey, &size);
        if (!data)
@@ -330,7 +330,7 @@ c_write (int argc, VALUE *argv, VALUE self)
                comp = Qtrue;
 
        ckey = StringValuePtr (key);
-       CHECK_KEY (key);
+       CHECK_NO_BIN0 (key);
        cbuf = StringValuePtr (buf);
 
        n = eet_write (*ef, ckey,
@@ -368,7 +368,7 @@ c_read_image (VALUE self, VALUE key)
        CHECK_CLOSED (ef);
 
        ckey = StringValuePtr (key);
-       CHECK_KEY (key);
+       CHECK_NO_BIN0 (key);
 
        data = eet_data_image_read (*ef, ckey, &w, &h,
                                    &has_alpha, &level, &quality,
@@ -424,7 +424,7 @@ c_write_image (int argc, VALUE *argv, VALUE self)
                has_alpha = Qfalse;
 
        ckey = StringValuePtr (key);
-       CHECK_KEY (key);
+       CHECK_NO_BIN0 (key);
        cbuf = StringValuePtr (buf);
        Check_Type (w, T_FIXNUM);
        Check_Type (h, T_FIXNUM);
@@ -466,8 +466,7 @@ chunk_init (VALUE self, VALUE tag, VALUE data)
        StringValue (tag);
        StringValue (data);
 
-       if (rb_funcall (tag, id_include, 1, INT2FIX (0)) == Qtrue)
-               rb_raise (rb_eArgError, "tag must not contain binary zeroes");
+       CHECK_NO_BIN0 (tag);
 
        /* libeet uses a signed 32bit integer to store the
         * chunk size, so make sure we don't overflow it
@@ -602,7 +601,7 @@ int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
 
        rb_scan_args (argc, argv, "11", &tag, &type);
 
-       ary = rb_ary_new3 (1, self);
+       ary = rb_ary_new4 (1, &self);
 
        if (type == sym_char)
                cfmt = "c";
@@ -615,7 +614,7 @@ int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
        args[1] = rb_funcall (ary, id_pack, 1, rb_str_new2 (cfmt));
        chunk = rb_class_new_instance (2, args, cChunk);
 
-       return rb_ary_new3 (1, chunk);
+       return rb_ary_new4 (1, &chunk);
 }
 
 static VALUE
@@ -645,7 +644,7 @@ float_to_eet_chunks (int argc, VALUE *argv, VALUE self)
        args[1] = rb_str_new (buf, len);
        chunk = rb_class_new_instance (2, args, cChunk);
 
-       return rb_ary_new3 (1, chunk);
+       return rb_ary_new4 (1, &chunk);
 }
 
 void