bdb1 0.2.4 → 0.2.5

data/ext/bdb1/bdb1.h

@@ -1,29 +1,5 @@
 #include <ruby.h>
 
-#ifndef StringValue
-#define StringValue(x,y) do {				\
-    if (TYPE(x) != T_STRING) x = rb_str_to_str(x);	\
-} while(0)
-#endif
-
-#ifndef StringValuePtr
-#define StringValuePtr(x) STR2CSTR(x)
-#endif
-
-#ifndef SafeStringValue
-#define SafeStringValue(x) Check_SafeStr(x)
-#endif
-
-#ifndef RSTRING_PTR
-# define RSTRING_PTR(x_) RSTRING(x_)->ptr
-# define RSTRING_LEN(x_) RSTRING(x_)->len
-#endif
-
-#ifndef RARRAY_PTR
-# define RARRAY_PTR(x_) RARRAY(x_)->ptr
-# define RARRAY_LEN(x_) RARRAY(x_)->len
-#endif
-
 #ifdef COMPAT185
 #include <db_185.h>
 #else
@@ -140,12 +116,12 @@ extern VALUE bdb1_init _((int, VALUE *, VALUE));
 extern VALUE bdb1_put _((int, VALUE *, VALUE));
 extern VALUE bdb1_get _((int, VALUE *, VALUE));
 extern VALUE bdb1_del _((VALUE, VALUE));
-extern VALUE bdb1_test_load _((VALUE, DBT *, int));
+extern VALUE bdb1_test_load _((VALUE, const DBT *, int));
 extern int bdb1_test_error _((int));
 extern VALUE bdb1_each_value _((VALUE));
 extern VALUE bdb1_each_eulav _((VALUE));
 extern VALUE bdb1_each_key _((VALUE));
-extern VALUE bdb1_index _((VALUE, VALUE));
+extern VALUE bdb1_key _((VALUE, VALUE));
 extern VALUE bdb1_has_value _((VALUE, VALUE));
 extern VALUE bdb1_internal_value _((VALUE, VALUE, VALUE, int));
 extern VALUE bdb1_to_type _((VALUE, VALUE, VALUE));

data/ext/bdb1/delegate.c

@@ -4,15 +4,13 @@ static ID id_send;
 VALUE bdb1_cDelegate;
 
 void
-bdb1_deleg_free(delegst)
-    struct deleg_class *delegst;
+bdb1_deleg_free(struct deleg_class *delegst)
 {
     free(delegst);
 }
 
 void
-bdb1_deleg_mark(delegst)
-    struct deleg_class *delegst;
+bdb1_deleg_mark(struct deleg_class *delegst)
 {
     bdb1_DB *dbst;
 
@@ -26,28 +24,8 @@ bdb1_deleg_mark(delegst)
     if (delegst->obj) rb_gc_mark(delegst->obj);
 }
 
-#ifndef HAVE_RB_BLOCK_CALL
-
-static VALUE
-bdb1_deleg_each(tmp)
-    VALUE *tmp;
-{
-    return rb_funcall2(tmp[0], id_send, (int)tmp[1], (VALUE *)tmp[2]);
-}
-
 static VALUE
-bdb1_deleg_yield(i, res)
-    VALUE i, res;
-{
-    return rb_ary_push(res, rb_yield(i));
-}
-
-#endif
-
-static VALUE
-bdb1_deleg_missing(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_deleg_missing(int argc, VALUE *argv, VALUE obj)
 {
     struct deleg_class *delegst, *newst;
     bdb1_DB *dbst;
@@ -55,17 +33,7 @@ bdb1_deleg_missing(argc, argv, obj)
 
     Data_Get_Struct(obj, struct deleg_class, delegst);
     if (rb_block_given_p()) {
-#if HAVE_RB_BLOCK_CALL
 	res = rb_block_call(delegst->obj, id_send, argc, argv, rb_yield, 0);
-#else
-	VALUE tmp[3];
-
-	tmp[0] = delegst->obj;
-	tmp[1] = (VALUE)argc;
-	tmp[2] = (VALUE)argv;
-	res = rb_ary_new();
-	rb_iterate(bdb1_deleg_each, (VALUE)tmp, bdb1_deleg_yield, res);
-#endif
     }
     else {
 	res = rb_funcall2(delegst->obj, id_send, argc, argv);
@@ -99,29 +67,27 @@ bdb1_deleg_missing(argc, argv, obj)
     return res;
 }
 
-#define DELEG_0(id)						\
-   VALUE obj;							\
+#define DELEG_0(meth)						\
    {								\
        struct deleg_class *delegst;				\
        Data_Get_Struct(obj, struct deleg_class, delegst);	\
-       return rb_funcall2(delegst->obj, id, 0, 0);		\
+       return rb_funcall2(delegst->obj, rb_intern(meth), 0, 0);	\
    }
 
-static VALUE bdb1_deleg_inspect(obj) DELEG_0(rb_intern("inspect"))
-static VALUE bdb1_deleg_to_s(obj)    DELEG_0(rb_intern("to_s"))
-static VALUE bdb1_deleg_to_str(obj)  DELEG_0(rb_intern("to_str"))
-static VALUE bdb1_deleg_to_a(obj)    DELEG_0(rb_intern("to_a"))
-static VALUE bdb1_deleg_to_ary(obj)  DELEG_0(rb_intern("to_ary"))
-static VALUE bdb1_deleg_to_i(obj)    DELEG_0(rb_intern("to_i"))
-static VALUE bdb1_deleg_to_int(obj)  DELEG_0(rb_intern("to_int"))
-static VALUE bdb1_deleg_to_f(obj)    DELEG_0(rb_intern("to_f"))
-static VALUE bdb1_deleg_to_hash(obj) DELEG_0(rb_intern("to_hash"))
-static VALUE bdb1_deleg_to_io(obj)   DELEG_0(rb_intern("to_io"))
-static VALUE bdb1_deleg_to_proc(obj) DELEG_0(rb_intern("to_proc"))
+static VALUE bdb1_deleg_inspect(VALUE obj) DELEG_0("inspect")
+static VALUE bdb1_deleg_to_s(VALUE obj)    DELEG_0("to_s")
+static VALUE bdb1_deleg_to_str(VALUE obj)  DELEG_0("to_str")
+static VALUE bdb1_deleg_to_a(VALUE obj)	   DELEG_0("to_a")
+static VALUE bdb1_deleg_to_ary(VALUE obj)  DELEG_0("to_ary")
+static VALUE bdb1_deleg_to_i(VALUE obj)	   DELEG_0("to_i")
+static VALUE bdb1_deleg_to_int(VALUE obj)  DELEG_0("to_int")
+static VALUE bdb1_deleg_to_f(VALUE obj)	   DELEG_0("to_f")
+static VALUE bdb1_deleg_to_hash(VALUE obj) DELEG_0("to_hash")
+static VALUE bdb1_deleg_to_io(VALUE obj)   DELEG_0("to_io")
+static VALUE bdb1_deleg_to_proc(VALUE obj) DELEG_0("to_proc")
 
 VALUE
-bdb1_deleg_to_orig(obj)
-    VALUE obj;
+bdb1_deleg_to_orig(VALUE obj)
 {
     struct deleg_class *delegst;
     Data_Get_Struct(obj, struct deleg_class, delegst);
@@ -129,15 +95,13 @@ bdb1_deleg_to_orig(obj)
 }
 
 static VALUE
-bdb1_deleg_orig(obj)
-    VALUE obj;
+bdb1_deleg_orig(VALUE obj)
 {
     return obj;
 }
 
 static VALUE
-bdb1_deleg_dump(obj, limit)
-    VALUE obj, limit;
+bdb1_deleg_dump(VALUE obj, VALUE limit)
 {
     struct deleg_class *delegst;
     bdb1_DB *dbst;
@@ -147,33 +111,49 @@ bdb1_deleg_dump(obj, limit)
 }
 
 static VALUE
-bdb1_deleg_load(obj, str)
-    VALUE obj, str;
+bdb1_deleg_load(VALUE obj, VALUE str)
 {
     bdb1_DB *dbst;
 
-    if ((obj = rb_thread_local_aref(rb_thread_current(), bdb1_id_current_db)) == Qnil) {
+    if (NIL_P(obj = rb_thread_local_aref(rb_thread_current(), bdb1_id_current_db))) {
 	rb_raise(bdb1_eFatal, "BUG : current_db not set");
     }
     Data_Get_Struct(obj, bdb1_DB, dbst);
     return rb_funcall(dbst->marshal, rb_intern("load"), 1, str);
 }
 
-void bdb1_init_delegator()
+void
+bdb1_init_delegator(void)
 {
     id_send = rb_intern("send");
     bdb1_cDelegate = rb_define_class_under(bdb1_mDb, "Delegate", rb_cObject);
     {
 	VALUE ary, tmp = Qfalse;
-	char *method;
 	int i;
+	ID  id_eq = rb_intern("=="),
+	    id_eqq = rb_intern("==="),
+	    id_match = rb_intern("=~"),
+	    id_not = rb_intern("!"),
+	    id_neq = rb_intern("!="),
+	    id_notmatch = rb_intern("!~");
 
 	ary = rb_class_instance_methods(1, &tmp, rb_mKernel);
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    method = StringValuePtr(RARRAY_PTR(ary)[i]);
-	    if (!strcmp(method, "==") ||
-		!strcmp(method, "===") || !strcmp(method, "=~")) continue;
-	    rb_undef_method(bdb1_cDelegate, method);
+	    VALUE method = RARRAY_PTR(ary)[i];
+	    VALUE mid;
+	    if (!SYMBOL_P(method)) {
+		Check_Type(method, T_STRING);
+		mid = rb_intern(RSTRING_PTR(method));
+	    }
+	    else
+		mid = SYM2ID(method);
+	    if (mid == id_eq ||
+		mid == id_eqq ||
+		mid == id_match ||
+		mid == id_not ||
+		mid == id_neq ||
+		mid == id_notmatch) continue;
+	    rb_undef_method(bdb1_cDelegate, rb_id2name(mid));
 	}
     }
     rb_define_method(bdb1_cDelegate, "method_missing", bdb1_deleg_missing, -1);

data/ext/bdb1/extconf.rb

@@ -12,22 +12,4 @@ if enable_config("shared", true)
   $static = nil
 end
 
-%w[rb_frame_this_func rb_block_call].each do |f|
-  have_func(f)
-end
-
-%w[insert values_at map select].each do |f|
-  print "checking for Array\##{f}... "
-  if [].respond_to?(f)
-    puts "yes"
-    $CFLAGS += " -DHAVE_RB_ARY_#{f.upcase}"
-  else
-    puts "no"
-  end
-end
-
 create_makefile("bdb1")
-
-File.open("Makefile", "a") { |make|
-  make.puts "test: $(DLLIB)"
-}

data/ext/bdb1/recnum.c

@@ -3,9 +3,7 @@
 static ID id_cmp;
 
 static VALUE
-bdb1_recnum_init(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_recnum_init(int argc, VALUE *argv, VALUE obj)
 {
     VALUE *nargv;
     VALUE array = rb_str_new2("array_base");
@@ -26,9 +24,7 @@ bdb1_recnum_init(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_subseq(obj, beg, len)
-    VALUE obj;
-    long beg, len;
+bdb1_sary_subseq(VALUE obj, long beg, long len)
 {
     VALUE ary2, a;
     bdb1_DB *dbst;
@@ -52,8 +48,7 @@ bdb1_sary_subseq(obj, beg, len)
 }
 
 static VALUE
-bdb1_sary_entry(obj, position)
-    VALUE obj, position;
+bdb1_sary_entry(VALUE obj, VALUE position)
 {
     bdb1_DB *dbst;
     long offset;
@@ -81,7 +76,7 @@ bdb1_sary_entry(obj, position)
  *   Retrieves the +nth+ item from an array.  Index starts from zero.
  *   If index is the negative, counts backward from the end of the
  *   array.  The index of the last element is -1. Returns +nil+, if
- *   the +nth+ element is not exist in the array.
+ *   the +nth+ element does not exist in the array.
  *
  * * db[start..end]
  *   Returns an array containing the objects from +start+ to +end+,
@@ -89,15 +84,13 @@ bdb1_sary_entry(obj, position)
  *   array, it will be rounded to the length.  If +start+ is out of an
  *   array range , returns +nil+.  And if +start+ is larger than end
  *   with in array range, returns empty array ([]).
-
+ *
  * * db[start, length]
  *   Returns an array containing +length+ items from +start+.  Returns
  *   +nil+ if +length+ is negative.
  */
 static VALUE
-bdb1_sary_aref(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_sary_aref(int argc, VALUE *argv, VALUE obj)
 {
     VALUE arg1, arg2;
     long beg, len;
@@ -133,9 +126,7 @@ bdb1_sary_aref(argc, argv, obj)
 }
 
 static VALUE
-bdb1_intern_shift_pop(obj, depart, len)
-    VALUE obj;
-    int depart, len;
+bdb1_intern_shift_pop(VALUE obj, int depart, int len)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -161,9 +152,7 @@ bdb1_intern_shift_pop(obj, depart, len)
 }
 
 static void
-bdb1_sary_replace(obj, beg, len, rpl)
-    VALUE obj, rpl;
-    long beg, len;
+bdb1_sary_replace(VALUE obj, long beg, long len, VALUE rpl)
 {
     long i, j, rlen;
     VALUE tmp[2];
@@ -240,26 +229,23 @@ bdb1_sary_replace(obj, beg, len, rpl)
  *
  * Element assignment - with the following syntax:
  *
- * * db[nth]
+ * * db[nth] = val
  *   Changes the +nth+ element of the array into +val+.  If +nth+ is
  *   larger than array length, the array shall be extended
  *   automatically.  Extended region shall be initialized by +nil+.
  *
- * * db[start..end]
+ * * db[start..end] = val
  *   Replaces the items from +start+ to +end+ with +val+.  If +val+ is
  *   not an array, the type of +val+ will be converted into the Array
  *   using +to_a+ method.
  *
- * * db[start, length]
+ * * db[start, length] = val
  *   Replaces the +length+ items from +start+ with +val+.  If +val+ is
  *   not an array, the type of +val+ will be converted into the Array
  *   using +to_a+.
  */
 static VALUE
-bdb1_sary_aset(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_sary_aset(int argc, VALUE *argv, VALUE obj)
 {
     long  beg, len;
     bdb1_DB *dbst;
@@ -310,13 +296,8 @@ bdb1_sary_aset(argc, argv, obj)
     return argv[1];
 }
 
-#if HAVE_RB_ARY_INSERT
-
 static VALUE
-bdb1_sary_insert(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_sary_insert(int argc, VALUE *argv, VALUE obj)
 {
     long pos;
 
@@ -338,18 +319,14 @@ bdb1_sary_insert(argc, argv, obj)
     return obj;
 }
 
-#endif
-
 static VALUE
-bdb1_sary_at(obj, pos)
-    VALUE obj, pos;
+bdb1_sary_at(VALUE obj, VALUE pos)
 {
     return bdb1_sary_entry(obj, pos);
 }
 
 static VALUE
-bdb1_sary_first(obj)
-    VALUE obj;
+bdb1_sary_first(VALUE obj)
 {
     bdb1_DB *dbst;
     VALUE tmp;
@@ -360,8 +337,7 @@ bdb1_sary_first(obj)
 }
 
 static VALUE
-bdb1_sary_last(obj)
-    VALUE obj;
+bdb1_sary_last(VALUE obj)
 {
     bdb1_DB *dbst;
     VALUE tmp;
@@ -373,9 +349,7 @@ bdb1_sary_last(obj)
 }
 
 static VALUE
-bdb1_sary_fetch(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_sary_fetch(int argc, VALUE *argv, VALUE obj)
 {
     VALUE pos, ifnone;
     bdb1_DB *dbst;
@@ -397,8 +371,7 @@ bdb1_sary_fetch(argc, argv, obj)
 
 
 static VALUE
-bdb1_sary_concat(obj, y)
-    VALUE obj, y;
+bdb1_sary_concat(VALUE obj, VALUE y)
 {
     bdb1_DB *dbst;
     long i;
@@ -416,8 +389,7 @@ bdb1_sary_concat(obj, y)
 }
 
 static VALUE
-bdb1_sary_push(obj, y)
-    VALUE obj, y;
+bdb1_sary_push(VALUE obj, VALUE y)
 {
     bdb1_DB *dbst;
     VALUE tmp[2];
@@ -431,9 +403,7 @@ bdb1_sary_push(obj, y)
 }
 
 static VALUE
-bdb1_sary_push_m(argc, argv, obj)
-    int argc;
-    VALUE obj, *argv;
+bdb1_sary_push_m(int argc, VALUE *argv, VALUE obj)
 {
     bdb1_DB *dbst;
     long i;
@@ -455,10 +425,7 @@ bdb1_sary_push_m(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_s_create(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_sary_s_create(int argc, VALUE *argv, VALUE obj)
 {
     VALUE res;
     int i;
@@ -474,8 +441,7 @@ bdb1_sary_s_create(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_shift(obj)
-    VALUE obj;
+bdb1_sary_shift(VALUE obj)
 {
     VALUE res;
     bdb1_DB *dbst;
@@ -487,8 +453,7 @@ bdb1_sary_shift(obj)
 }
 
 static VALUE
-bdb1_sary_pop(obj)
-    VALUE obj;
+bdb1_sary_pop(VALUE obj)
 {
     VALUE res;
     bdb1_DB *dbst;
@@ -500,10 +465,7 @@ bdb1_sary_pop(obj)
 }
 
 static VALUE
-bdb1_sary_unshift_m(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_sary_unshift_m(int argc, VALUE *argv, VALUE obj)
 {
     bdb1_DB *dbst;
     VALUE tmp[3];
@@ -526,8 +488,7 @@ bdb1_sary_unshift_m(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_length(obj)
-    VALUE obj;
+bdb1_sary_length(VALUE obj)
 {
     bdb1_DB *dbst;
 
@@ -537,40 +498,35 @@ bdb1_sary_length(obj)
 }
 
 static VALUE
-bdb1_sary_empty_p(obj)
-    VALUE obj;
+bdb1_sary_empty_p(VALUE obj)
 {
     bdb1_DB *dbst;
 
     GetDB(obj, dbst);
     if (dbst->len < 0) rb_raise(bdb1_eFatal, "Invalid BDB::Recnum");
-    return (dbst->len)?Qfalse:Qtrue;
+    return dbst->len == 0 ? Qtrue : Qfalse;
 }
 
 static VALUE
-bdb1_sary_rindex(obj, a)
-    VALUE obj, a;
+bdb1_sary_rindex(VALUE obj, VALUE a)
 {
     return bdb1_internal_value(obj, a, Qtrue, DB_PREV);
 }
 
 static VALUE
-bdb1_sary_to_a(obj)
-    VALUE obj;
+bdb1_sary_to_a(VALUE obj)
 {
     return bdb1_to_type(obj, rb_ary_new(), Qfalse);
 }
 
 static VALUE
-bdb1_sary_reverse_m(obj)
-    VALUE obj;
+bdb1_sary_reverse_m(VALUE obj)
 {
     return bdb1_to_type(obj, rb_ary_new(), Qnil);
 }
 
 static VALUE
-bdb1_sary_reverse_bang(obj)
-    VALUE obj;
+bdb1_sary_reverse_bang(VALUE obj)
 {
     long i, j;
     bdb1_DB *dbst;
@@ -596,15 +552,13 @@ bdb1_sary_reverse_bang(obj)
 }
 
 static VALUE
-bdb1_sary_collect_bang(obj)
-    VALUE obj;
+bdb1_sary_collect_bang(VALUE obj)
 {
     return bdb1_each_vc(obj, Qtrue, Qfalse);
 }
 
 static VALUE
-bdb1_sary_collect(obj)
-    VALUE obj;
+bdb1_sary_collect(VALUE obj)
 {
     if (!rb_block_given_p()) {
 	return bdb1_sary_to_a(obj);
@@ -613,9 +567,7 @@ bdb1_sary_collect(obj)
 }
 
 static VALUE
-bdb1_sary_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_sary_values_at(int argc, VALUE *argv, VALUE obj)
 {
     VALUE result;
     long i;
@@ -628,60 +580,23 @@ bdb1_sary_values_at(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_select(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_sary_select(VALUE obj)
 {
-    VALUE result;
-    long i;
-
     if (rb_block_given_p()) {
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
 	return bdb1_each_vc(obj, Qfalse, Qtrue);
     }
-#if HAVE_RB_ARY_VALUES_AT
-    rb_warn("Recnum#%s is deprecated; use Recnum#values_at",
-#if HAVE_RB_FRAME_THIS_FUNC
-	    rb_id2name(rb_frame_this_func()));
-#else
-	    rb_id2name(rb_frame_last_func()));
-#endif
-#endif
-    return bdb1_sary_values_at(argc, argv, obj);
-}
-
-static VALUE
-bdb1_sary_indexes(argc, argv, obj)
-    int argc;
-    VALUE obj, *argv;
-{
-    VALUE indexes;
-    int i;
-
-#if HAVE_RB_ARY_VALUES_AT
-    rb_warn("Recnum#%s is deprecated; use Recnum#values_at",
-#if HAVE_RB_FRAME_THIS_FUNC
-	    rb_id2name(rb_frame_this_func()));
-#else
-	    rb_id2name(rb_frame_last_func()));
-#endif
-#endif
-    return bdb1_sary_select(argc, argv, obj);
+    rb_raise(rb_eArgError, "block is not given");
 }
 
 static VALUE
-bdb1_sary_filter(obj)
-    VALUE obj;
+bdb1_sary_filter(VALUE obj)
 {
     rb_warn("BDB1::Recnum#filter is deprecated; use BDB1::Recnum#collect!");
     return bdb1_sary_collect_bang(obj);
 }
 
 static VALUE
-bdb1_sary_delete(obj, item)
-    VALUE obj, item;
+bdb1_sary_delete(VALUE obj, VALUE item)
 {
     bdb1_DB *dbst;
     long i1, i2;
@@ -710,8 +625,7 @@ bdb1_sary_delete(obj, item)
 }
 
 static VALUE
-bdb1_sary_delete_at_m(obj, a)
-    VALUE obj, a;
+bdb1_sary_delete_at_m(VALUE obj, VALUE a)
 {
     bdb1_DB *dbst;
     long pos;
@@ -732,8 +646,7 @@ bdb1_sary_delete_at_m(obj, a)
 }
 
 static VALUE
-bdb1_sary_reject_bang(obj)
-    VALUE obj;
+bdb1_sary_reject_bang(VALUE obj)
 {
     bdb1_DB *dbst;
     long i1, i2;
@@ -756,16 +669,14 @@ bdb1_sary_reject_bang(obj)
 }
 
 static VALUE
-bdb1_sary_delete_if(obj)
-    VALUE obj;
+bdb1_sary_delete_if(VALUE obj)
 {
     bdb1_sary_reject_bang(obj);
     return obj;
 }
 
 static VALUE
-bdb1_sary_replace_m(obj, obj2)
-    VALUE obj, obj2;
+bdb1_sary_replace_m(VALUE obj, VALUE obj2)
 {
     bdb1_DB *dbst;
 
@@ -776,8 +687,7 @@ bdb1_sary_replace_m(obj, obj2)
 }
 
 static VALUE
-bdb1_sary_clear(obj)
-    VALUE obj;
+bdb1_sary_clear(VALUE obj)
 {
     bdb1_DB *dbst;
     bdb1_clear(obj);
@@ -787,10 +697,7 @@ bdb1_sary_clear(obj)
 }
 
 static VALUE
-bdb1_sary_fill(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_sary_fill(int argc, VALUE *argv, VALUE obj)
 {
     VALUE item, arg1, arg2, tmp[2];
     long beg, len, i;
@@ -827,11 +734,11 @@ bdb1_sary_fill(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_cmp(obj, obj2)
-    VALUE obj, obj2;
+bdb1_sary_cmp(VALUE obj, VALUE obj2)
 {
     bdb1_DB *dbst, *dbst2;
-    VALUE a, a2, tmp, ary;
+    VALUE a, a2, tmp;
+    int ary;
     long i, len;
 
     if (obj == obj2) return INT2FIX(0);
@@ -842,14 +749,14 @@ bdb1_sary_cmp(obj, obj2)
 	if (len > RARRAY_LEN(obj2)) {
 	    len = RARRAY_LEN(obj2);
 	}
-	ary = Qtrue;
+	ary = 1;
     }
     else {
 	GetDB(obj2, dbst2);
 	if (len > dbst2->len) {
 	    len = dbst2->len;
 	}
-	ary = Qfalse;
+	ary = 0;
     }
     for (i = 0; i < len; i++) {
 	tmp = INT2NUM(i);
@@ -865,17 +772,14 @@ bdb1_sary_cmp(obj, obj2)
 	    return tmp;
 	}
     }
-    len = dbst->len - (ary?RARRAY_LEN(obj2):dbst2->len);
+    len = dbst->len - (ary ? RARRAY_LEN(obj2) : dbst2->len);
     if (len == 0) return INT2FIX(0);
     if (len > 0) return INT2FIX(1);
     return INT2FIX(-1);
 }
 
 static VALUE
-bdb1_sary_slice_bang(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_sary_slice_bang(int argc, VALUE *argv, VALUE obj)
 {
     VALUE arg1, arg2;
     long pos, len;
@@ -910,50 +814,43 @@ bdb1_sary_slice_bang(argc, argv, obj)
 }
 
 static VALUE
-bdb1_sary_plus(obj, y)
-    VALUE obj, y;
+bdb1_sary_plus(VALUE obj, VALUE y)
 {
     return rb_ary_plus(bdb1_sary_to_a(obj), y);
 }
 
 static VALUE
-bdb1_sary_times(obj, y)
-    VALUE obj, y;
+bdb1_sary_times(VALUE obj, VALUE y)
 {
     return rb_funcall(bdb1_sary_to_a(obj), rb_intern("*"), 1, y);
 }
 
 static VALUE
-bdb1_sary_diff(obj, y)
-    VALUE obj, y;
+bdb1_sary_diff(VALUE obj, VALUE y)
 {
     return rb_funcall(bdb1_sary_to_a(obj), rb_intern("-"), 1, y);
 }
 
 static VALUE
-bdb1_sary_and(obj, y)
-    VALUE obj, y;
+bdb1_sary_and(VALUE obj, VALUE y)
 {
     return rb_funcall(bdb1_sary_to_a(obj), rb_intern("&"), 1, y);
 }
 
 static VALUE
-bdb1_sary_or(obj, y)
-    VALUE obj, y;
+bdb1_sary_or(VALUE obj, VALUE y)
 {
     return rb_funcall(bdb1_sary_to_a(obj), rb_intern("|"), 1, y);
 }
 
 static VALUE
-bdb1_sary_compact(obj)
-    VALUE obj;
+bdb1_sary_compact(VALUE obj)
 {
     return rb_funcall(bdb1_sary_to_a(obj), rb_intern("compact"), 0, 0);
 }
 
 static VALUE
-bdb1_sary_compact_bang(obj)
-    VALUE obj;
+bdb1_sary_compact_bang(VALUE obj)
 {
     bdb1_DB *dbst;
     long i, j;
@@ -977,8 +874,7 @@ bdb1_sary_compact_bang(obj)
 }
 
 static VALUE
-bdb1_sary_nitems(obj)
-    VALUE obj;
+bdb1_sary_nitems(VALUE obj)
 {
     bdb1_DB *dbst;
     long i, j;
@@ -995,8 +891,7 @@ bdb1_sary_nitems(obj)
 }
 
 static VALUE
-bdb1_sary_each_index(obj)
-    VALUE obj;
+bdb1_sary_each_index(VALUE obj)
 {
     bdb1_DB *dbst;
     long i;
@@ -1008,7 +903,8 @@ bdb1_sary_each_index(obj)
     return obj;
 }
 
-void bdb1_init_recnum()
+void
+bdb1_init_recnum(void)
 {
     id_cmp = rb_intern("<=>");
     bdb1_cRecnum = rb_define_class_under(bdb1_mDb, "Recnum", bdb1_cCommon);
@@ -1027,32 +923,23 @@ void bdb1_init_recnum()
     rb_define_method(bdb1_cRecnum, "pop", bdb1_sary_pop, 0);
     rb_define_method(bdb1_cRecnum, "shift", bdb1_sary_shift, 0);
     rb_define_method(bdb1_cRecnum, "unshift", bdb1_sary_unshift_m, -1);
-#if HAVE_RB_ARY_INSERT
     rb_define_method(bdb1_cRecnum, "insert", bdb1_sary_insert, -1);
-#endif
     rb_define_method(bdb1_cRecnum, "each", bdb1_each_value, 0);
     rb_define_method(bdb1_cRecnum, "each_index", bdb1_sary_each_index, 0);
     rb_define_method(bdb1_cRecnum, "reverse_each", bdb1_each_eulav, 0);
     rb_define_method(bdb1_cRecnum, "length", bdb1_sary_length, 0);
     rb_define_alias(bdb1_cRecnum,  "size", "length");
     rb_define_method(bdb1_cRecnum, "empty?", bdb1_sary_empty_p, 0);
-    rb_define_method(bdb1_cRecnum, "index", bdb1_index, 1);
+    rb_define_method(bdb1_cRecnum, "key", bdb1_key, 1);
+    rb_define_method(bdb1_cRecnum, "index", bdb1_key, 1);
     rb_define_method(bdb1_cRecnum, "rindex", bdb1_sary_rindex, 1);
-    rb_define_method(bdb1_cRecnum, "indexes", bdb1_sary_indexes, -1);
-    rb_define_method(bdb1_cRecnum, "indices", bdb1_sary_indexes, -1);
     rb_define_method(bdb1_cRecnum, "reverse", bdb1_sary_reverse_m, 0);
     rb_define_method(bdb1_cRecnum, "reverse!", bdb1_sary_reverse_bang, 0);
     rb_define_method(bdb1_cRecnum, "collect", bdb1_sary_collect, 0);
     rb_define_method(bdb1_cRecnum, "collect!", bdb1_sary_collect_bang, 0);
-#if HAVE_RB_ARY_MAP
     rb_define_method(bdb1_cRecnum, "map", bdb1_sary_collect, 0);
-#endif
-#if HAVE_RB_ARY_VALUES_AT
     rb_define_method(bdb1_cRecnum, "values_at", bdb1_sary_values_at, -1);
-#endif
-#if HAVE_RB_ARY_SELECT
-    rb_define_method(bdb1_cRecnum, "select", bdb1_sary_select, -1);
-#endif
+    rb_define_method(bdb1_cRecnum, "select", bdb1_sary_select, 0);
     rb_define_method(bdb1_cRecnum, "map!", bdb1_sary_collect_bang, 0);
     rb_define_method(bdb1_cRecnum, "filter", bdb1_sary_filter, 0);
     rb_define_method(bdb1_cRecnum, "delete", bdb1_sary_delete, 1);