Reverted revision 62.

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

diff --git a/ext/ext.c b/ext/ext.c
index 8fe22e30e328c40ebb2fc4f3b12e0dc3e54863e9..bf1c4f03572c08089f1df51d823fcaf4efbabedd 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 62 2005-06-09 17:42:34Z tilman $
+ * $Id: ext.c 71 2005-07-16 12:28:17Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -47,11 +47,10 @@
 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_push, id_keys,
+static ID id_include, id_serialize, id_keys, id_pack,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -444,42 +443,42 @@ stream_serialize (VALUE self)
        struct RArray *stream;
        long i;
 
-       ret = rb_str_new2 ("");
-
        stream = RARRAY (self);
        if (!stream->len)
-               return ret;
+               return rb_str_new2 ("");
+
+       ret = rb_ary_new ();
 
        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_str_append (ret, str);
+               rb_ary_push (ret, str);
        }
 
-       return ret;
+       return rb_ary_join (ret, Qnil);
 }
 
 static VALUE
 chunk_init (VALUE self, VALUE tag, VALUE data)
 {
-       unsigned long len;
+       long tag_len, data_len, tmp;
 
        StringValue (tag);
        StringValue (data);
 
-       if (rb_funcall (tag, id_include, 1, INT2FIX (0)) == Qtrue) \
+       if (rb_funcall (tag, id_include, 1, INT2FIX (0)) == Qtrue)
                rb_raise (rb_eArgError, "tag must not contain binary zeroes");
 
        /* libeet uses a signed 32bit integer to store the
         * chunk size, so make sure we don't overflow it
         */
-       len = RSTRING (tag)->len + 1 + RSTRING (data)->len;
-       if (len < 0 || len >= 2147483647L)
+       tag_len = RSTRING (tag)->len;
+       data_len = RSTRING (data)->len;
+       tmp = tag_len + 1 + data_len;
+
+       if (tmp < tag_len || tmp < data_len || tmp < 1 || tmp >= 2147483647L)
                rb_raise (rb_eArgError, "tag or data too long");
 
        rb_ivar_set (self, id_tag, rb_str_dup_frozen (tag));
@@ -497,11 +496,9 @@ chunk_serialize (VALUE self)
        struct RString *tag, *data;
 
        tmp = rb_ivar_get (self, id_tag);
-       StringValue (tmp);
        tag = RSTRING (tmp);
 
        tmp = rb_ivar_get (self, id_data);
-       StringValue (tmp);
        data = RSTRING (tmp);
 
        buf_len = 9 + tag->len + data->len;
@@ -531,8 +528,7 @@ chunk_serialize (VALUE self)
 static int
 for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 {
-       VALUE value, type, chunks;
-       long len, i;
+       VALUE value, type, tmp;
 
        if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
                rb_raise (ePropError, "hash value is not an array");
@@ -542,12 +538,9 @@ for_each_prop (VALUE tag, VALUE arg, VALUE stream)
                return ST_CONTINUE;
 
        type = rb_ary_entry (arg, 1);
-       chunks = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
-
-       len = RARRAY (chunks)->len;
+       tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
 
-       for (i = 0; i < len; i++)
-               rb_funcall (stream, id_push, 1, rb_ary_entry (chunks, i));
+       rb_ary_concat (stream, tmp);
 
        return ST_CONTINUE;
 }
@@ -595,6 +588,9 @@ c_to_eet (VALUE self)
 
        args[0] = name;
        args[1] = rb_funcall (stream, id_serialize, 0);
+
+       rb_ary_clear (stream); /* give the GC a hand... */
+
        chunk = rb_class_new_instance (2, args, cChunk);
 
        return rb_funcall (chunk, id_serialize, 0);
@@ -618,7 +614,7 @@ int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
                cfmt = "q";
 
        args[0] = tag;
-       args[1] = rb_funcall (ary, rb_intern ("pack"), 1, rb_str_new2 (cfmt));
+       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);
@@ -691,14 +687,11 @@ 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");
-       id_push = rb_intern ("push");
        id_keys = rb_intern ("keys");
+       id_pack = rb_intern ("pack");
        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");