X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=28bfa4cb1ba52c94263f79cd7dff82fe397d5ec7;hb=d8fc25053021bc96da9e0072e524d7a4c434fc1a;hp=79ba28da667f6e5477bedaea4c39f98c8b95443d;hpb=84496cc5000b9a263388ed4520706bc69a392641;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index 79ba28d..28bfa4c 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,7 +1,5 @@
 /*
- * $Id: ext.c 76 2006-05-14 13:51:45Z tilman $
- *
- * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (c) 2005-2007 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -28,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)) \
@@ -189,7 +187,7 @@ c_close (VALUE self)
 }
 
 static VALUE
-get_keys (Eet_File *ef, char *glob)
+get_keys (Eet_File *ef, const char *glob)
 {
 	VALUE ret;
 	char **keys;
@@ -263,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);
@@ -292,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)
@@ -332,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,
@@ -370,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,
@@ -426,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);
@@ -468,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
@@ -600,7 +597,7 @@ static VALUE
 int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
 {
 	VALUE tag, type = Qnil, ary, args[2], chunk;
-	char *cfmt = "V";
+	const char *cfmt = "V";
 
 	rb_scan_args (argc, argv, "11", &tag, &type);