From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 1 Apr 2007 13:00:27 +0000 (+0200)
Subject: Renamed and tweaked CHECK_KEY.
X-Git-Url: http://git.code-monkey.de/?p=ruby-eet.git;a=commitdiff_plain;h=d8fc25053021bc96da9e0072e524d7a4c434fc1a

Renamed and tweaked CHECK_KEY.
---

diff --git a/ext/ext.c b/ext/ext.c
index 44c6ed5..28bfa4c 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -26,9 +26,9 @@
 #include <st.h>
 #include <locale.h>
 
-#define CHECK_KEY(key) \
+#define CHECK_NO_BIN0(key) \
 	if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \
-		rb_raise (rb_eArgError, "key must not contain binary zeroes");
+		rb_raise (rb_eArgError, #key " must not contain binary zeroes");
 
 #define CHECK_CLOSED(ef) \
 	if (!*(ef)) \
@@ -261,7 +261,7 @@ c_delete (VALUE self, VALUE key)
 	CHECK_CLOSED (ef);
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 
 	if (!eet_delete (*ef, ckey))
 		rb_raise (rb_eIOError, "cannot delete entry - %s", ckey);
@@ -290,7 +290,7 @@ c_read (VALUE self, VALUE key)
 	CHECK_CLOSED (ef);
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 
 	data = eet_read (*ef, ckey, &size);
 	if (!data)
@@ -330,7 +330,7 @@ c_write (int argc, VALUE *argv, VALUE self)
 		comp = Qtrue;
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 	cbuf = StringValuePtr (buf);
 
 	n = eet_write (*ef, ckey,
@@ -368,7 +368,7 @@ c_read_image (VALUE self, VALUE key)
 	CHECK_CLOSED (ef);
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 
 	data = eet_data_image_read (*ef, ckey, &w, &h,
 	                            &has_alpha, &level, &quality,
@@ -424,7 +424,7 @@ c_write_image (int argc, VALUE *argv, VALUE self)
 		has_alpha = Qfalse;
 
 	ckey = StringValuePtr (key);
-	CHECK_KEY (key);
+	CHECK_NO_BIN0 (key);
 	cbuf = StringValuePtr (buf);
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
@@ -466,8 +466,7 @@ chunk_init (VALUE self, VALUE tag, VALUE data)
 	StringValue (tag);
 	StringValue (data);
 
-	if (rb_funcall (tag, id_include, 1, INT2FIX (0)) == Qtrue)
-		rb_raise (rb_eArgError, "tag must not contain binary zeroes");
+	CHECK_NO_BIN0 (tag);
 
 	/* libeet uses a signed 32bit integer to store the
 	 * chunk size, so make sure we don't overflow it