projects
/
ruby-eet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed and tweaked CHECK_KEY.
[ruby-eet.git]
/
ext
/
ext.c
diff --git
a/ext/ext.c
b/ext/ext.c
index 79ba28da667f6e5477bedaea4c39f98c8b95443d..28bfa4cb1ba52c94263f79cd7dff82fe397d5ec7 100644
(file)
--- 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
*
* 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>
#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) \
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)) \
#define CHECK_CLOSED(ef) \
if (!*(ef)) \
@@
-189,7
+187,7
@@
c_close (VALUE self)
}
static VALUE
}
static VALUE
-get_keys (Eet_File *ef, char *glob)
+get_keys (Eet_File *ef, c
onst c
har *glob)
{
VALUE ret;
char **keys;
{
VALUE ret;
char **keys;
@@
-263,7
+261,7
@@
c_delete (VALUE self, VALUE key)
CHECK_CLOSED (ef);
ckey = StringValuePtr (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);
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_CLOSED (ef);
ckey = StringValuePtr (key);
- CHECK_
KEY
(key);
+ CHECK_
NO_BIN0
(key);
data = eet_read (*ef, ckey, &size);
if (!data)
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);
comp = Qtrue;
ckey = StringValuePtr (key);
- CHECK_
KEY
(key);
+ CHECK_
NO_BIN0
(key);
cbuf = StringValuePtr (buf);
n = eet_write (*ef, ckey,
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_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,
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);
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);
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);
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
/* 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;
int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
{
VALUE tag, type = Qnil, ary, args[2], chunk;
- char *cfmt = "V";
+ c
onst c
har *cfmt = "V";
rb_scan_args (argc, argv, "11", &tag, &type);
rb_scan_args (argc, argv, "11", &tag, &type);