Reverted revision 62.

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

diff --git a/ext/ext.c b/ext/ext.c
index 8ba3d5c16daf8d4a709e761f2263ae0cbae3600a..bf1c4f03572c08089f1df51d823fcaf4efbabedd 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 69 2005-07-08 22:35:08Z tilman $
+ * $Id: ext.c 71 2005-07-16 12:28:17Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -47,8 +47,7 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
-             eEetError, eNameError, ePropError, eStreamError,
-             eBadElementError,
+             eEetError, eNameError, ePropError,
              sym_lossy, sym_level, sym_quality, sym_char, sym_short,
              sym_long_long, sym_double;
 static ID id_include, id_serialize, id_keys, id_pack,
@@ -453,9 +452,6 @@ stream_serialize (VALUE self)
        for (i = 0; i < stream->len; i++) {
                VALUE str;
 
-               if (rb_obj_is_kind_of (stream->ptr[i], cChunk) == Qfalse)
-                       rb_raise (eBadElementError, "stream member is not a Chunk");
-
                str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
 
                rb_ary_push (ret, str);
@@ -533,8 +529,6 @@ static int
 for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 {
        VALUE value, type, tmp;
-       struct RArray *chunks;
-       long i;
 
        if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
                rb_raise (ePropError, "hash value is not an array");
@@ -546,11 +540,7 @@ for_each_prop (VALUE tag, VALUE arg, VALUE stream)
        type = rb_ary_entry (arg, 1);
        tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
 
-       Check_Type (tmp, T_ARRAY);
-       chunks = RARRAY (tmp);
-
-       for (i = 0; i < chunks->len; i++)
-               rb_ary_push (stream, chunks->ptr[i]);
+       rb_ary_concat (stream, tmp);
 
        return ST_CONTINUE;
 }
@@ -697,9 +687,6 @@ Init_eet_ext ()
        eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
        eNameError = rb_define_class_under (m, "NameError", eEetError);
        ePropError = rb_define_class_under (m, "PropertyError", eEetError);
-       eStreamError = rb_define_class_under (m, "StreamError", eEetError);
-       eBadElementError = rb_define_class_under (m, "BadElementError",
-                                                 eStreamError);
 
        id_include = rb_intern ("include?");
        id_serialize = rb_intern ("serialize");