X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=4a572c203fba7c4205272328c0e71e126dc935fa;hb=6b51e31a7f18e33ec8d03d63e1c8427ce0be8a9d;hp=4fb3f1e45895a2873f0ed3ee115fa320a6448eef;hpb=1a7967e7d0581ab9eedd0e18862323bc6f00d029;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index 4fb3f1e..4a572c2 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ext.c 72 2005-07-16 13:15:42Z tilman $
- *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -36,6 +34,15 @@
 	if (!*(ef)) \
 		rb_raise (rb_eIOError, "closed stream");
 
+#define CHECK_READABLE(ef) \
+	switch (eet_mode_get (*ef)) { \
+		case EET_FILE_MODE_READ: \
+		case EET_FILE_MODE_READ_WRITE: \
+			break; \
+		default: \
+			rb_raise (rb_eIOError, "permission denied"); \
+	}
+
 #ifdef WORDS_BIGENDIAN
 # define BSWAP32(x) \
 	((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
@@ -179,47 +186,61 @@ c_close (VALUE self)
 	return self;
 }
 
+static VALUE
+get_keys (Eet_File *ef, const char *glob)
+{
+	VALUE ret;
+	char **keys;
+	int i, count = 0;
+
+	keys = eet_list (ef, glob, &count);
+	ret = rb_ary_new2 (count);
+
+	for (i = 0; i < count; i++)
+		rb_ary_store (ret, i, rb_str_new2 (keys[i]));
+
+	free (keys);
+
+	return ret;
+}
+
 /*
  * call-seq:
- *  ef.list([glob]) -> array
+ *  ef.entries -> array
  *
- * Returns an Array of entries in _ef_ that match the shell glob
- * _glob_ (defaulting to "*").
+ * Returns an Array with the keys of the entries in _ef_.
+ * If the keys cannot be retrieved, an +IOError+ is raised.
  */
 static VALUE
-c_list (int argc, VALUE *argv, VALUE self)
+c_entries (VALUE self)
 {
-	VALUE glob = Qnil, ret;
 	Eet_File **ef = NULL;
-	char **entries, *tmp = "*";
-	int i, count = 0;
 
 	Data_Get_Struct (self, Eet_File *, ef);
 	CHECK_CLOSED (ef);
+	CHECK_READABLE (ef);
 
-	switch (eet_mode_get (*ef)) {
-		case EET_FILE_MODE_READ:
-		case EET_FILE_MODE_READ_WRITE:
-			break;
-		default:
-			rb_raise (rb_eIOError, "cannot list entries");
-	}
-
-	rb_scan_args (argc, argv, "01", &glob);
-
-	if (!NIL_P (glob))
-		tmp = StringValuePtr (glob);
-
-	ret = rb_ary_new ();
-
-	entries = eet_list (*ef, tmp, &count);
+	return get_keys (*ef, "*");
+}
 
-	for (i = 0; i < count; i++)
-		rb_ary_push (ret, rb_str_new2 (entries[i]));
+/*
+ * call-seq:
+ *  ef[glob] -> array
+ *
+ * Returns an Array with the keys of entries in _ef_ that match the
+ * shell glob _glob_.
+ * If the keys cannot be retrieved, an +IOError+ is raised.
+ */
+static VALUE
+c_glob (VALUE self, VALUE glob)
+{
+	Eet_File **ef = NULL;
 
-	free (entries);
+	Data_Get_Struct (self, Eet_File *, ef);
+	CHECK_CLOSED (ef);
+	CHECK_READABLE (ef);
 
-	return ret;
+	return get_keys (*ef, StringValuePtr (glob));
 }
 
 /*
@@ -340,7 +361,8 @@ c_read_image (VALUE self, VALUE key)
 	Eet_File **ef = NULL;
 	void *data;
 	char *ckey;
-	int w = 0, h = 0, has_alpha = 0, level = 0, quality = 0, lossy = 0;
+	unsigned int w = 0, h = 0;
+	int has_alpha = 0, level = 0, quality = 0, lossy = 0;
 
 	Data_Get_Struct (self, Eet_File *, ef);
 	CHECK_CLOSED (ef);
@@ -480,7 +502,7 @@ chunk_to_s (VALUE self)
 	buf_len = 9 + tag->len + data->len;
 	ret = rb_str_buf_new (buf_len);
 
-	buf = RSTRING (ret)->ptr;
+	buf = (unsigned char *) RSTRING (ret)->ptr;
 	RSTRING (ret)->len = buf_len;
 
 	memcpy (buf, "CHnK", 4);
@@ -576,7 +598,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);
 
@@ -638,7 +660,8 @@ Init_eet_ext ()
 	rb_define_singleton_method (c, "open", c_open, -1);
 	rb_define_method (c, "initialize", c_init, -1);
 	rb_define_method (c, "close", c_close, 0);
-	rb_define_method (c, "list", c_list, -1);
+	rb_define_method (c, "entries", c_entries, 0);
+	rb_define_method (c, "[]", c_glob, 1);
 	rb_define_method (c, "delete", c_delete, 1);
 	rb_define_method (c, "read", c_read, 1);
 	rb_define_method (c, "write", c_write, -1);