X-Git-Url: http://git.code-monkey.de/?p=ruby-eet.git;a=blobdiff_plain;f=ext%2Fext.c;h=61ceb4fec551697613666a41cc77f8f328a4188f;hp=aa69823ece8360281edbad9683b03882946ae4d8;hb=4c39436405f953592eb31ce329eebd6d27d10b30;hpb=c89b56944f67c8d5c27c961998cccce39fc0bfb0

diff --git a/ext/ext.c b/ext/ext.c
index aa69823..61ceb4f 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 50 2005-05-30 20:38:34Z tilman $
+ * $Id: ext.c 51 2005-05-31 21:15:03Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -48,7 +48,7 @@ static VALUE c_close (VALUE self);
 static VALUE cStream, cChunk,
              eEetError, eNameError, ePropError,
              sym_lossy, sym_level, sym_quality;
-static ID id_include, id_serialize, id_push, id_empty,
+static ID id_include, id_serialize, id_push,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -558,14 +558,14 @@ c_to_eet (VALUE self)
 	props = rb_funcall (self, id_to_eet_properties, 0);
 
 	if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
-	    rb_funcall (props, id_empty, 0) == Qtrue)
+	    !RHASH (props)->tbl->num_entries)
 		rb_raise (ePropError, "invalid EET properties");
 
 	name = rb_funcall (self, id_to_eet_name, 0);
 	StringValue (name);
 
-	if (rb_funcall (name, id_include, 1, INT2FIX (0)) == Qtrue ||
-	    rb_funcall (name, id_empty, 0) == Qtrue)
+	if (!RSTRING (name)->len ||
+	    rb_funcall (name, id_include, 1, INT2FIX (0)))
 		rb_raise (eNameError, "invalid EET name");
 
 	stream = rb_class_new_instance (0, NULL, cStream);
@@ -619,7 +619,6 @@ Init_eet_ext ()
 	id_include = rb_intern ("include?");
 	id_serialize = rb_intern ("serialize");
 	id_push = rb_intern ("push");
-	id_empty = rb_intern ("empty?");
 	id_to_eet_chunks = rb_intern ("to_eet_chunks");
 	id_to_eet_name = rb_intern ("to_eet_name");
 	id_to_eet_properties = rb_intern ("to_eet_properties");