X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=e99d41ccf618604a1d9b40413abc1c8d79bf45f4;hb=a43aba1ff90d87bbc8ae7e5d63dc276ba65d4dae;hp=28bfa4cb1ba52c94263f79cd7dff82fe397d5ec7;hpb=d8fc25053021bc96da9e0072e524d7a4c434fc1a;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index 28bfa4c..e99d41c 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -557,13 +557,13 @@ c_to_eet (VALUE self)
 	long i;
 #endif
 
-	props = rb_funcall (self, id_to_eet_properties, 0);
+	props = rb_funcall2 (self, id_to_eet_properties, 0, NULL);
 
 	if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
 	    !RHASH (props)->tbl->num_entries)
 		rb_raise (ePropError, "invalid EET properties");
 
-	name = rb_funcall (self, id_to_eet_name, 0);
+	name = rb_funcall2 (self, id_to_eet_name, 0, NULL);
 	StringValue (name);
 
 	if (!RSTRING (name)->len ||
@@ -575,7 +575,7 @@ c_to_eet (VALUE self)
 #ifdef HAVE_RB_HASH_FOREACH
 	rb_hash_foreach (props, for_each_prop, stream);
 #else
-	keys = RARRAY (rb_funcall (props, id_keys, 0));
+	keys = RARRAY (rb_funcall2 (props, id_keys, 0, NULL));
 
 	for (i = 0; i < keys->len; i++)
 		for_each_prop (keys->ptr[i],
@@ -590,7 +590,7 @@ c_to_eet (VALUE self)
 
 	chunk = rb_class_new_instance (2, args, cChunk);
 
-	return rb_funcall (chunk, id_to_s, 0);
+	return rb_funcall2 (chunk, id_to_s, 0, NULL);
 }
 
 static VALUE
@@ -601,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";
@@ -614,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
@@ -644,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