X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=d85cd56088783be0f2be26c30c44fdfd2a7a7017;hb=3ec32d2eaff86d232c43cea68d9abb021b7971ac;hp=236df7c0450359299852bdd27fa93ebdc6685221;hpb=d7f7f0063af5a351fd41fa18eebc6025b26985af;p=ruby-eet.git diff --git a/ext/ext.c b/ext/ext.c index 236df7c..d85cd56 100644 --- a/ext/ext.c +++ b/ext/ext.c @@ -1,5 +1,5 @@ /* - * $Id: ext.c 13 2005-03-27 18:35:51Z tilman $ + * $Id: ext.c 31 2005-04-12 19:03:50Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -27,11 +27,14 @@ #include #define CHECK_KEY(key) \ - Check_Type ((key), T_STRING); \ - if (rb_funcall ((key), rb_intern ("include?"), \ - 1, INT2FIX (0)) == Qtrue) \ + if (rb_funcall (key, rb_intern ("include?"), \ + 1, INT2FIX (0)) == Qtrue) \ rb_raise (rb_eArgError, "key must not contain binary zeroes"); +#define CHECK_CLOSED(ef) \ + if (!*(ef)) \ + rb_raise (rb_eIOError, "closed stream"); + static VALUE c_close (VALUE self); static void @@ -94,17 +97,15 @@ c_init (int argc, VALUE *argv, VALUE self) VALUE file = Qnil, mode = Qnil; Eet_File **ef = NULL; Eet_File_Mode m = EET_FILE_MODE_READ; - const char *tmp; + const char *tmp, *cfile; Data_Get_Struct (self, Eet_File *, ef); rb_scan_args (argc, argv, "11", &file, &mode); - Check_Type (file, T_STRING); + cfile = StringValuePtr (file); if (!NIL_P (mode)) { - Check_Type (mode, T_STRING); - tmp = StringValuePtr (mode); if (!strcmp (tmp, "r+")) m = EET_FILE_MODE_READ_WRITE; @@ -116,7 +117,7 @@ c_init (int argc, VALUE *argv, VALUE self) eet_init (); - *ef = eet_open (StringValuePtr (file), m); + *ef = eet_open (cfile, m); if (!*ef) { switch (m) { case EET_FILE_MODE_READ_WRITE: @@ -128,7 +129,7 @@ c_init (int argc, VALUE *argv, VALUE self) break; } - rb_raise (rb_eRuntimeError, tmp, file); + rb_raise (rb_eRuntimeError, tmp, cfile); } return self; @@ -151,15 +152,12 @@ c_close (VALUE self) Eet_File **ef = NULL; Data_Get_Struct (self, Eet_File *, ef); + CHECK_CLOSED (ef); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - else { - eet_close (*ef); - *ef = NULL; + eet_close (*ef); + *ef = NULL; - eet_shutdown (); - } + eet_shutdown (); return self; } @@ -180,9 +178,7 @@ c_list (int argc, VALUE *argv, VALUE self) int i, count = 0; Data_Get_Struct (self, Eet_File *, ef); - - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); + CHECK_CLOSED (ef); switch (eet_mode_get (*ef)) { case EET_FILE_MODE_READ: @@ -194,10 +190,8 @@ c_list (int argc, VALUE *argv, VALUE self) rb_scan_args (argc, argv, "01", &glob); - if (!NIL_P (glob)) { - Check_Type (glob, T_STRING); + if (!NIL_P (glob)) tmp = StringValuePtr (glob); - } ret = rb_ary_new (); @@ -223,19 +217,16 @@ static VALUE c_delete (VALUE self, VALUE key) { Eet_File **ef = NULL; - char *tmp; + char *ckey; Data_Get_Struct (self, Eet_File *, ef); + CHECK_CLOSED (ef); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - + ckey = StringValuePtr (key); CHECK_KEY (key); - tmp = StringValuePtr (key); - - if (!eet_delete (*ef, tmp)) - rb_raise (rb_eIOError, "cannot delete entry - %s", tmp); + if (!eet_delete (*ef, ckey)) + rb_raise (rb_eIOError, "cannot delete entry - %s", ckey); return self; } @@ -254,18 +245,18 @@ c_read (VALUE self, VALUE key) VALUE ret; Eet_File **ef = NULL; void *data; + char *ckey; int size = 0; Data_Get_Struct (self, Eet_File *, ef); + CHECK_CLOSED (ef); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - + ckey = StringValuePtr (key); CHECK_KEY (key); - data = eet_read (*ef, StringValuePtr (key), &size); + data = eet_read (*ef, ckey, &size); if (!data) - rb_raise (rb_eIOError, "cannot read entry - %s", key); + rb_raise (rb_eIOError, "cannot read entry - %s", ckey); ret = rb_str_new (data, size); @@ -289,23 +280,23 @@ c_write (int argc, VALUE *argv, VALUE self) { VALUE key = Qnil, buf = Qnil, comp = Qnil; Eet_File **ef = NULL; + char *ckey, *cbuf; int n; Data_Get_Struct (self, Eet_File *, ef); - - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); + CHECK_CLOSED (ef); rb_scan_args (argc, argv, "21", &key, &buf, &comp); if (NIL_P (comp)) comp = Qtrue; + ckey = StringValuePtr (key); CHECK_KEY (key); - Check_Type (buf, T_STRING); + cbuf = StringValuePtr (buf); - n = eet_write (*ef, StringValuePtr (key), - StringValuePtr (buf), RSTRING (buf)->len, + n = eet_write (*ef, ckey, + cbuf, RSTRING (buf)->len, comp == Qtrue); if (!n) rb_raise (rb_eIOError, "couldn't write to file"); @@ -331,20 +322,20 @@ c_read_image (VALUE self, VALUE key) VALUE ret, comp; Eet_File **ef = NULL; void *data; + char *ckey; int w = 0, h = 0, has_alpha = 0, level = 0, quality = 0, lossy = 0; Data_Get_Struct (self, Eet_File *, ef); + CHECK_CLOSED (ef); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - + ckey = StringValuePtr (key); CHECK_KEY (key); - data = eet_data_image_read (*ef, StringValuePtr (key), &w, &h, + data = eet_data_image_read (*ef, ckey, &w, &h, &has_alpha, &level, &quality, &lossy); if (!data) - rb_raise (rb_eIOError, "cannot read entry - %s", key); + rb_raise (rb_eIOError, "cannot read entry - %s", ckey); comp = rb_hash_new (); rb_hash_aset (comp, ID2SYM (rb_intern ("lossy")), INT2FIX (lossy)); @@ -381,12 +372,11 @@ c_write_image (int argc, VALUE *argv, VALUE self) VALUE key = Qnil, buf = Qnil, w = Qnil, h = Qnil, has_alpha = Qnil; VALUE comp = Qnil, tmp; Eet_File **ef = NULL; + char *ckey, *cbuf; int n, lossy = 0, level = 9, quality = 100; Data_Get_Struct (self, Eet_File *, ef); - - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); + CHECK_CLOSED (ef); rb_scan_args (argc, argv, "42", &key, &buf, &w, &h, &has_alpha, &comp); @@ -394,8 +384,9 @@ c_write_image (int argc, VALUE *argv, VALUE self) if (NIL_P (has_alpha)) has_alpha = Qfalse; + ckey = StringValuePtr (key); CHECK_KEY (key); - Check_Type (buf, T_STRING); + cbuf = StringValuePtr (buf); Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); @@ -418,8 +409,7 @@ c_write_image (int argc, VALUE *argv, VALUE self) if (!RSTRING (buf)->len) return INT2FIX (0); - n = eet_data_image_write (*ef, StringValuePtr (key), - StringValuePtr (buf), + n = eet_data_image_write (*ef, ckey, cbuf, FIX2INT (w), FIX2INT (h), has_alpha == Qtrue, level, quality, lossy);