X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=1819958b73976137104e2b3f316ac024e0efaab0;hb=3eb6e149e8a04c8e9571588b1782b31891c70a90;hp=236df7c0450359299852bdd27fa93ebdc6685221;hpb=d7f7f0063af5a351fd41fa18eebc6025b26985af;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index 236df7c..1819958 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 30 2005-04-12 18:38:31Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -27,11 +27,16 @@
 #include <ruby.h>
 
 #define CHECK_KEY(key) \
-	Check_Type ((key), T_STRING); \
-	if (rb_funcall ((key), rb_intern ("include?"), \
-	                    1, INT2FIX (0)) == Qtrue) \
+	StringValue((key)); \
+\
+	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,16 +99,16 @@ 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);
+		StringValue (mode);
 
 		tmp = StringValuePtr (mode);
 		if (!strcmp (tmp, "r+"))
@@ -116,7 +121,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 +133,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 +156,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 +182,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 +194,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 ();
 
@@ -226,9 +224,7 @@ c_delete (VALUE self, VALUE key)
 	char *tmp;
 
 	Data_Get_Struct (self, Eet_File *, ef);
-
-	if (!*ef)
-		rb_raise (rb_eIOError, "closed stream");
+	CHECK_CLOSED (ef);
 
 	CHECK_KEY (key);
 
@@ -257,9 +253,7 @@ c_read (VALUE self, VALUE key)
 	int size = 0;
 
 	Data_Get_Struct (self, Eet_File *, ef);
-
-	if (!*ef)
-		rb_raise (rb_eIOError, "closed stream");
+	CHECK_CLOSED (ef);
 
 	CHECK_KEY (key);
 
@@ -292,9 +286,7 @@ c_write (int argc, VALUE *argv, VALUE self)
 	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);
 
@@ -302,7 +294,7 @@ c_write (int argc, VALUE *argv, VALUE self)
 		comp = Qtrue;
 
 	CHECK_KEY (key);
-	Check_Type (buf, T_STRING);
+	StringValue (buf);
 
 	n = eet_write (*ef, StringValuePtr (key),
 	               StringValuePtr (buf), RSTRING (buf)->len,
@@ -334,9 +326,7 @@ c_read_image (VALUE self, VALUE key)
 	int w = 0, h = 0, has_alpha = 0, level = 0, quality = 0, lossy = 0;
 
 	Data_Get_Struct (self, Eet_File *, ef);
-
-	if (!*ef)
-		rb_raise (rb_eIOError, "closed stream");
+	CHECK_CLOSED (ef);
 
 	CHECK_KEY (key);
 
@@ -384,9 +374,7 @@ c_write_image (int argc, VALUE *argv, VALUE self)
 	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);
@@ -395,7 +383,7 @@ c_write_image (int argc, VALUE *argv, VALUE self)
 		has_alpha = Qfalse;
 
 	CHECK_KEY (key);
-	Check_Type (buf, T_STRING);
+	StringValue (buf);
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);