Internal API update.

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

diff --git a/ext/ext.c b/ext/ext.c
index e686444dc605b65fcaaa1b3405c86b803c82db0f..4fb3f1e45895a2873f0ed3ee115fa320a6448eef 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 66 2005-06-29 15:42:58Z tilman $
+ * $Id: ext.c 72 2005-07-16 13:15:42Z 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_keys, id_pack,
+static ID id_include, id_to_s, id_keys, id_pack,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -437,37 +436,10 @@ c_write_image (int argc, VALUE *argv, VALUE self)
                return INT2FIX (n);
 }
 
-static VALUE
-stream_serialize (VALUE self)
-{
-       VALUE ret;
-       struct RArray *stream;
-       long i;
-
-       stream = RARRAY (self);
-       if (!stream->len)
-               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_ary_push (ret, str);
-       }
-
-       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);
@@ -478,8 +450,11 @@ chunk_init (VALUE self, VALUE tag, VALUE data)
        /* 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));
@@ -489,7 +464,7 @@ chunk_init (VALUE self, VALUE tag, VALUE data)
 }
 
 static VALUE
-chunk_serialize (VALUE self)
+chunk_to_s (VALUE self)
 {
        VALUE tmp, ret;
        unsigned int size, buf_len;
@@ -497,11 +472,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;
@@ -532,8 +505,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");
@@ -545,11 +516,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;
 }
@@ -596,10 +563,13 @@ c_to_eet (VALUE self)
 #endif
 
        args[0] = name;
-       args[1] = rb_funcall (stream, id_serialize, 0);
+       args[1] = rb_ary_to_s (stream);
+
+       rb_ary_clear (stream); /* give the GC a hand... */
+
        chunk = rb_class_new_instance (2, args, cChunk);
 
-       return rb_funcall (chunk, id_serialize, 0);
+       return rb_funcall (chunk, id_to_s, 0);
 }
 
 static VALUE
@@ -676,11 +646,10 @@ Init_eet_ext ()
        rb_define_method (c, "write_image", c_write_image, -1);
 
        cStream = rb_define_class_under (m, "Stream", rb_cArray);
-       rb_define_method (cStream, "serialize", stream_serialize, 0);
 
        cChunk = rb_define_class_under (m, "Chunk", rb_cObject);
        rb_define_method (cChunk, "initialize", chunk_init, 2);
-       rb_define_method (cChunk, "serialize", chunk_serialize, 0);
+       rb_define_method (cChunk, "to_s", chunk_to_s, 0);
 
        rb_define_attr (cChunk, "tag", 1, 0);
        rb_define_attr (cChunk, "data", 1, 0);
@@ -693,12 +662,9 @@ 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_to_s = rb_intern ("to_s");
        id_keys = rb_intern ("keys");
        id_pack = rb_intern ("pack");
        id_to_eet_chunks = rb_intern ("to_eet_chunks");