bdb1 0.2.4 → 0.2.5

data/Changes

@@ -39,13 +39,26 @@
 * BDB1::Common::[]
 * corrected set_fetch_value
 * new return value for []= (1.8.0)
-* adapted for 1.8.0
+* adapted to 1.8.0
 
 --- 0.1.9
 
-* adapted for 1.8 (minor modifications)
+* adapted to 1.8 (minor modifications)
 
 --- 0.2.2
 
 * corrected dbst->info (Thanks Matthew Luckie <mjl@luckie.org.nz>)
 * added documentation for ri (make ri-site)
+
+--- 0.2.3
+
+* adapted to ruby 1.9.0.
+
+--- 0.2.4
+
+* converted rd to rdoc.
+* gemified.
+
+--- 0.2.5
+
+* adapted to ruby 1.9.3.

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/bdb1.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "bdb1"
-  s.version = "0.2.4"
+  s.name = %q{bdb1}
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Guy Decoux", "Akinori MUSHA"]
-  s.date = "2011-12-22"
-  s.description = "This is a Ruby interface to Berkeley DB 1.85 and 1.86."
-  s.email = "knu@idaemons.org"
-  s.extensions = ["ext/bdb1/extconf.rb"]
+  s.authors = [%q{Guy Decoux}, %q{Akinori MUSHA}]
+  s.date = %q{2012-01-02}
+  s.description = %q{This is a Ruby interface to Berkeley DB 1.85 and 1.86.}
+  s.email = %q{knu@idaemons.org}
+  s.extensions = [%q{ext/bdb1/extconf.rb}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -45,11 +45,11 @@ Gem::Specification.new do |s|
     "test/test_recnum.rb",
     "test/tmp/.keep_me"
   ]
-  s.homepage = "http://github.com/knu/ruby-bdb1"
-  s.licenses = ["Ruby's"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "A Ruby interface to Berkeley DB 1.85 and 1.86"
+  s.homepage = %q{http://github.com/knu/ruby-bdb1}
+  s.licenses = [%q{Ruby's}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
+  s.summary = %q{A Ruby interface to Berkeley DB 1.85 and 1.86}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/ext/bdb1/bdb1.c

@@ -13,7 +13,7 @@ static ID id_bt_compare, id_bt_prefix, id_h_hash, bdb1_id_call;
 static VALUE bdb1_errstr;
 static int bdb1_errcall = 0;
 
-static char *
+static const char *
 db_strerror(int err)
 {
     if (err == 0)
@@ -26,8 +26,7 @@ db_strerror(int err)
 }
 
 int
-bdb1_test_error(comm)
-    int comm;
+bdb1_test_error(int comm)
 {
     VALUE error;
 
@@ -39,7 +38,7 @@ bdb1_test_error(comm)
         error = bdb1_eFatal;
         if (bdb1_errcall) {
             bdb1_errcall = 0;
-            rb_raise(error, "%s -- %s", StringValuePtr(bdb1_errstr), db_strerror(comm));
+            rb_raise(error, "%s -- %s", StringValueCStr(bdb1_errstr), db_strerror(comm));
         }
         else
             rb_raise(error, "%s", db_strerror(errno));
@@ -48,14 +47,9 @@ bdb1_test_error(comm)
 }
 
 static VALUE
-test_dump(obj, key, a, type_kv)
-    VALUE obj;
-    DBT *key;
-    VALUE a;
-    int type_kv;
+test_dump(VALUE obj, DBT *key, VALUE a, int type_kv)
 {
     bdb1_DB *dbst;
-    int is_nil = 0;
     VALUE tmp = a;
 
     Data_Get_Struct(obj, bdb1_DB, dbst);
@@ -67,7 +61,7 @@ test_dump(obj, key, a, type_kv)
 	    tmp = rb_funcall(dbst->filter[type_kv], bdb1_id_call, 1, a);
  	}
     }
-    if (dbst->marshal) {
+    if (dbst->marshal != Qundef) {
         if (rb_obj_is_kind_of(a, bdb1_cDelegate)) {
 	    tmp = bdb1_deleg_to_orig(tmp);
 	}
@@ -78,22 +72,23 @@ test_dump(obj, key, a, type_kv)
     }
     else {
         tmp = rb_obj_as_string(tmp);
-        if (a == Qnil)
-            is_nil = 1;
+        if (NIL_P(a)) {
+	    key->data = StringValueCStr(tmp);
+	    key->size = RSTRING_LEN(tmp) + 1;
+	    return tmp;
+	}
     }
     key->data = StringValuePtr(tmp);
-    key->size = RSTRING_LEN(tmp) + is_nil;
+    key->size = RSTRING_LEN(tmp);
     return tmp;
 }
 
 static VALUE
-test_ret(obj, tmp, a, type_kv)
-    VALUE obj, tmp, a;
-    int type_kv;
+test_ret(VALUE obj, VALUE tmp, VALUE a, int type_kv)
 {
     bdb1_DB *dbst;
     Data_Get_Struct(obj, bdb1_DB, dbst);
-    if (dbst->marshal || a == Qnil) {
+    if (dbst->marshal != Qundef || NIL_P(a)) {
 	return a;
     }
     if (dbst->filter[type_kv]) {
@@ -103,11 +98,7 @@ test_ret(obj, tmp, a, type_kv)
 }
 
 static VALUE
-test_recno(obj, key, recno, a)
-    VALUE obj;
-    DBT *key;
-    db_recno_t *recno;
-    VALUE a;
+test_recno(VALUE obj, DBT *key, db_recno_t *recno, VALUE a)
 {
     bdb1_DB *dbst;
     Data_Get_Struct(obj, bdb1_DB, dbst);
@@ -121,17 +112,14 @@ test_recno(obj, key, recno, a)
 }
 
 VALUE
-bdb1_test_load(obj, a, type_kv)
-    VALUE obj;
-    DBT *a;
-    int type_kv;
+bdb1_test_load(VALUE obj, const DBT *a, int type_kv)
 {
     VALUE res;
     int i;
     bdb1_DB *dbst;
 
     Data_Get_Struct(obj, bdb1_DB, dbst);
-    if (dbst->marshal) {
+    if (dbst->marshal != Qundef) {
 	res = rb_str_new(a->data, a->size);
 	if (dbst->filter[2 + type_kv]) {
 	    if (FIXNUM_P(dbst->filter[2 + type_kv])) {
@@ -168,9 +156,7 @@ bdb1_test_load(obj, a, type_kv)
 }
 
 static VALUE
-test_load_dyna(obj, key, val)
-    VALUE obj;
-    DBT *key, *val;
+test_load_dyna(VALUE obj, DBT *key, DBT *val)
 {
     bdb1_DB *dbst;
     VALUE del, res, tmp;
@@ -178,7 +164,7 @@ test_load_dyna(obj, key, val)
 
     Data_Get_Struct(obj, bdb1_DB, dbst);
     res = bdb1_test_load(obj, val, FILTER_VALUE);
-    if (dbst->marshal && !SPECIAL_CONST_P(res)) {
+    if (dbst->marshal != Qundef && !SPECIAL_CONST_P(res)) {
 	del = Data_Make_Struct(bdb1_cDelegate, struct deleg_class,
 			       bdb1_deleg_mark, bdb1_deleg_free, delegst);
 	delegst->db = obj;
@@ -197,13 +183,12 @@ test_load_dyna(obj, key, val)
 
 
 static int
-bdb1_bt_compare(a, b)
-    DBT *a, *b;
+bdb1_bt_compare(const DBT *a, const DBT *b)
 {
     VALUE obj, av, bv, res;
     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);
@@ -217,13 +202,12 @@ bdb1_bt_compare(a, b)
 }
 
 static size_t
-bdb1_bt_prefix(a, b)
-    DBT *a, *b;
+bdb1_bt_prefix(const DBT *a, const DBT *b)
 {
     VALUE obj, av, bv, res;
     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);
@@ -237,14 +221,12 @@ bdb1_bt_prefix(a, b)
 }
 
 static u_int32_t
-bdb1_h_hash(bytes, length)
-    void *bytes;
-    u_int32_t length;
+bdb1_h_hash(const void *bytes, size_t length)
 {
     VALUE obj, st, res;
     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);
@@ -253,12 +235,11 @@ bdb1_h_hash(bytes, length)
 	res = rb_funcall(obj, id_h_hash, 1, st);
     else
 	res = rb_funcall(dbst->h_hash, bdb1_id_call, 1, st);
-    return NUM2UINT(res);
+    return (u_int32_t)NUM2LONG(res);
 }
 
 static void
-bdb1_i_close(dbst)
-    bdb1_DB *dbst;
+bdb1_i_close(bdb1_DB *dbst)
 {
     if (dbst->dbp != NULL && !(dbst->options & BDB1_NOT_OPEN)) {
 	dbst->options |= BDB1_NOT_OPEN;
@@ -268,16 +249,14 @@ bdb1_i_close(dbst)
 }
 
 static void
-bdb1_free(dbst)
-    bdb1_DB *dbst;
+bdb1_free(bdb1_DB *dbst)
 {
     bdb1_i_close(dbst);
     free(dbst);
 }
 
 static void
-bdb1_mark(dbst)
-    bdb1_DB *dbst;
+bdb1_mark(bdb1_DB *dbst)
 {
     int i;
 
@@ -291,8 +270,7 @@ bdb1_mark(dbst)
 }
 
 static VALUE
-bdb1_i185_btree(obj, dbstobj)
-    VALUE obj, dbstobj;
+bdb1_i185_btree(VALUE obj, VALUE dbstobj)
 {
     VALUE key, value;
     bdb1_DB *dbst;
@@ -302,7 +280,7 @@ bdb1_i185_btree(obj, dbstobj)
     key = rb_ary_entry(obj, 0);
     value = rb_ary_entry(obj, 1);
     key = rb_obj_as_string(key);
-    options = StringValuePtr(key);
+    options = StringValueCStr(key);
     if (strcmp(options, "set_flags") == 0) {
 	dbst->has_info = Qtrue;
 	dbst->info.bi.flags = NUM2INT(value);
@@ -345,8 +323,7 @@ bdb1_i185_btree(obj, dbstobj)
 }
 
 static VALUE
-bdb1_i185_hash(obj, dbstobj)
-    VALUE obj, dbstobj;
+bdb1_i185_hash(VALUE obj, VALUE dbstobj)
 {
     VALUE key, value;
     bdb1_DB *dbst;
@@ -356,7 +333,7 @@ bdb1_i185_hash(obj, dbstobj)
     key = rb_ary_entry(obj, 0);
     value = rb_ary_entry(obj, 1);
     key = rb_obj_as_string(key);
-    options = StringValuePtr(key);
+    options = StringValueCStr(key);
     if (strcmp(options, "set_h_ffactor") == 0) {
 	dbst->has_info = Qtrue;
 	dbst->info.hi.ffactor = NUM2INT(value);
@@ -386,8 +363,7 @@ bdb1_i185_hash(obj, dbstobj)
 }
 
 static VALUE
-bdb1_i185_recno(obj, dbstobj)
-    VALUE obj, dbstobj;
+bdb1_i185_recno(VALUE obj, VALUE dbstobj)
 {
     VALUE key, value;
     bdb1_DB *dbst;
@@ -397,7 +373,7 @@ bdb1_i185_recno(obj, dbstobj)
     key = rb_ary_entry(obj, 0);
     value = rb_ary_entry(obj, 1);
     key = rb_obj_as_string(key);
-    options = StringValuePtr(key);
+    options = StringValueCStr(key);
     if (strcmp(options, "set_flags") == 0) {
 	dbst->has_info = Qtrue;
 	dbst->info.ri.flags = NUM2INT(value);
@@ -405,7 +381,7 @@ bdb1_i185_recno(obj, dbstobj)
     else if (strcmp(options, "set_re_delim") == 0) {
 	int ch;
 	if (TYPE(value) == T_STRING) {
-	    str = StringValuePtr(value);
+	    str = StringValueCStr(value);
 	    dbst->info.ri.bval = str[0];
 	}
 	else {
@@ -422,7 +398,7 @@ bdb1_i185_recno(obj, dbstobj)
     else if (strcmp(options, "set_re_pad") == 0) {
 	int ch;
 	if (TYPE(value) == T_STRING) {
-	    str = StringValuePtr(value);
+	    str = StringValueCStr(value);
 	    dbst->info.ri.bval = str[0];
 	}
 	else {
@@ -456,8 +432,7 @@ bdb1_i185_recno(obj, dbstobj)
 }
 
 static VALUE
-bdb1_load_dump(obj)
-    VALUE obj;
+bdb1_load_dump(VALUE obj)
 {
     VALUE res;
 
@@ -469,8 +444,7 @@ bdb1_load_dump(obj)
 }
 
 static VALUE
-bdb1_i185_common(obj, dbstobj)
-    VALUE obj, dbstobj;
+bdb1_i185_common(VALUE obj, VALUE dbstobj)
 {
     VALUE key, value;
     bdb1_DB *dbst;
@@ -480,7 +454,7 @@ bdb1_i185_common(obj, dbstobj)
     key = rb_ary_entry(obj, 0);
     value = rb_ary_entry(obj, 1);
     key = rb_obj_as_string(key);
-    options = StringValuePtr(key);
+    options = StringValueCStr(key);
     if (strcmp(options, "marshal") == 0) {
         switch (value) {
         case Qtrue:
@@ -488,7 +462,7 @@ bdb1_i185_common(obj, dbstobj)
 	    dbst->options |= BDB1_MARSHAL;
 	    break;
         case Qfalse:
-	    dbst->marshal = Qfalse;
+	    dbst->marshal = Qundef;
 	    dbst->options &= ~BDB1_MARSHAL;
 	    break;
         default:
@@ -528,12 +502,11 @@ bdb1_i185_common(obj, dbstobj)
 }
 
 static int
-bdb1_hard_count(dbp)
-    DB *dbp;
+bdb1_hard_count(DB *dbp)
 {
     DBT key, data;
     db_recno_t recno;
-    long count = 0;
+    int count = 0;
 
     DATA_ZERO(key);
     key.data = &recno;
@@ -644,10 +617,7 @@ bdb1_hard_count(dbp)
  *     end
  */
 VALUE
-bdb1_init(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_init(int argc, VALUE *argv, VALUE obj)
 {
     VALUE b, c, d, f;
     int mode, oflags;
@@ -668,7 +638,7 @@ bdb1_init(argc, argv, obj)
 	/* ... */
     case 2:
 	if (TYPE(c) == T_STRING) {
-	    char *m = StringValuePtr(c);
+	    char *m = StringValueCStr(c);
 	    if (strcmp(m, "r") == 0) {
 		oflags = DB_RDONLY;
 	    }
@@ -685,7 +655,7 @@ bdb1_init(argc, argv, obj)
 		rb_raise(bdb1_eFatal, "flags must be r, r+, w, w+, a or a+");
 	    }
 	}
-	else if (c == Qnil) {
+	else if (NIL_P(c)) {
 	    oflags = DB_RDONLY;
 	}
 	else {
@@ -695,7 +665,7 @@ bdb1_init(argc, argv, obj)
     case 1:
 	if (!NIL_P(b)) {
 	    SafeStringValue(b);
-	    name = StringValuePtr(b);
+	    name = StringValueCStr(b);
 	}
 	else {
 	    name = NULL;
@@ -758,8 +728,7 @@ bdb1_init(argc, argv, obj)
  * Closes the file.
  */
 static VALUE
-bdb1_close(obj)
-    VALUE obj;
+bdb1_close(VALUE obj)
 {
     VALUE opt;
     bdb1_DB *dbst;
@@ -773,13 +742,13 @@ bdb1_close(obj)
 }
 
 VALUE
-bdb1_s_alloc(obj)
-    VALUE obj;
+bdb1_s_alloc(VALUE obj)
 {
     bdb1_DB *dbst;
     VALUE res, cl;
 
     res = Data_Make_Struct(obj, bdb1_DB, bdb1_mark, bdb1_free, dbst);
+    dbst->marshal = Qundef;
     dbst->options |= BDB1_NOT_OPEN;
     cl = obj;
     while (cl) {
@@ -795,7 +764,7 @@ bdb1_s_alloc(obj)
 	    dbst->type = DB_RECNO;
 	    break;
 	}
-	cl = RCLASS(cl)->super;
+	cl = RCLASS_SUPER(cl);
     }
     if (!cl) {
 	rb_raise(bdb1_eFatal, "unknown database type");
@@ -804,16 +773,16 @@ bdb1_s_alloc(obj)
 	dbst->marshal = obj;
 	dbst->options |= BDB1_MARSHAL;
     }
-    if (rb_method_boundp(obj, rb_intern("bdb1_store_key"), 0) == Qtrue) {
+    if (rb_method_boundp(obj, rb_intern("bdb1_store_key"), 0)) {
 	dbst->filter[FILTER_KEY] = INT2FIX(rb_intern("bdb1_store_key"));
     }
-    if (rb_method_boundp(obj, rb_intern("bdb1_fetch_key"), 0) == Qtrue) {
+    if (rb_method_boundp(obj, rb_intern("bdb1_fetch_key"), 0)) {
 	dbst->filter[2 + FILTER_KEY] = INT2FIX(rb_intern("bdb1_fetch_key"));
     }
-    if (rb_method_boundp(obj, rb_intern("bdb1_store_value"), 0) == Qtrue) {
+    if (rb_method_boundp(obj, rb_intern("bdb1_store_value"), 0)) {
 	dbst->filter[FILTER_VALUE] = INT2FIX(rb_intern("bdb1_store_value"));
     }
-    if (rb_method_boundp(obj, rb_intern("bdb1_fetch_value"), 0) == Qtrue) {
+    if (rb_method_boundp(obj, rb_intern("bdb1_fetch_value"), 0)) {
 	dbst->filter[2 + FILTER_VALUE] = INT2FIX(rb_intern("bdb1_fetch_value"));
     }
     return res;
@@ -823,10 +792,7 @@ bdb1_s_alloc(obj)
  * Same as +new+.
  */
 static VALUE
-bdb1_s_create(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_s_create(int argc, VALUE *argv, VALUE obj)
 {
     VALUE st, res;
 
@@ -836,8 +802,7 @@ bdb1_s_create(argc, argv, obj)
 }
 
 static VALUE
-bdb1_i_create(obj, db)
-    VALUE obj, db;
+bdb1_i_create(VALUE obj, VALUE db)
 {
     VALUE tmp[2];
     tmp[0] = rb_ary_entry(obj, 0);
@@ -859,10 +824,7 @@ bdb1_i_create(obj, db)
  * given hash or pairs of objects.
  */
 static VALUE
-bdb1_s_aref(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_s_aref(int argc, VALUE *argv, VALUE obj)
 {
     VALUE res, tmp[2];
     int i;
@@ -886,10 +848,7 @@ bdb1_s_aref(argc, argv, obj)
  * initialized object which is automatically closed when done.
  */
 static VALUE
-bdb1_s_open(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_s_open(int argc, VALUE *argv, VALUE obj)
 {
     VALUE res = rb_funcall2(obj, rb_intern("new"), argc, argv);
     if (rb_block_given_p()) {
@@ -909,10 +868,7 @@ bdb1_s_open(argc, argv, obj)
  * return +nil+ if the specified key exist, otherwise +true+.
  */
 VALUE
-bdb1_put(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_put(int argc, VALUE *argv, VALUE obj)
 {
     volatile VALUE a0 = Qnil;
     volatile VALUE b0 = Qnil;
@@ -924,11 +880,10 @@ bdb1_put(argc, argv, obj)
 
     rb_secure(4);
     GetDB(obj, dbst);
-    flags = 0;
-    a = b = c = Qnil;
-    if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3) {
+    if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3)
         flags = NUM2INT(c);
-    }
+    else
+	flags = 0;
     DATA_ZERO(key);
     DATA_ZERO(data);
     a0 = test_recno(obj, &key, &recno, a);
@@ -936,14 +891,11 @@ bdb1_put(argc, argv, obj)
     ret = bdb1_test_error(dbst->dbp->put(dbst->dbp, &key, &data, flags));
     if (ret == DB_KEYEXIST)
 	return Qfalse;
-    else {
-	return test_ret(obj, b0, b, FILTER_VALUE);
-    }
+    return test_ret(obj, b0, b, FILTER_VALUE);
 }
 
 static VALUE
-bdb1_assign(obj, a, b)
-    VALUE obj, a, b;
+bdb1_assign(VALUE obj, VALUE a, VALUE b)
 {
     VALUE tmp[2];
     tmp[0] = a;
@@ -953,9 +905,7 @@ bdb1_assign(obj, a, b)
 }
 
 static VALUE
-test_load_key(obj, key)
-    VALUE obj;
-    DBT *key;
+test_load_key(VALUE obj, DBT *key)
 {
     bdb1_DB *dbst;
     Data_Get_Struct(obj, bdb1_DB, dbst);
@@ -965,30 +915,21 @@ test_load_key(obj, key)
 }
 
 static VALUE
-bdb1_assoc(obj, key, data)
-    VALUE obj;
-    DBT *key, *data;
+bdb1_assoc(VALUE obj, DBT *key, DBT *data)
 {
     return rb_assoc_new(test_load_key(obj, key),
 			bdb1_test_load(obj, data, FILTER_VALUE));
 }
 
 static VALUE
-bdb1_assoc_dyna(obj, key, data)
-    VALUE obj;
-    DBT *key, *data;
+bdb1_assoc_dyna(VALUE obj, DBT *key, DBT *data)
 {
     return rb_assoc_new(test_load_key(obj, key),
 			test_load_dyna(obj, key, data));
 }
 
 static VALUE
-bdb1_get_internal(argc, argv, obj, notfound, dyna)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-    VALUE notfound;
-    int dyna;
+bdb1_get_internal(int argc, VALUE *argv, VALUE obj, VALUE notfound, int dyna)
 {
     volatile VALUE a = Qnil;
     VALUE b, c;
@@ -1024,10 +965,7 @@ bdb1_get_internal(argc, argv, obj, notfound, dyna)
 }
 
 VALUE
-bdb1_get(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_get(int argc, VALUE *argv, VALUE obj)
 {
     return bdb1_get_internal(argc, argv, obj, Qnil, 0);
 }
@@ -1040,18 +978,13 @@ bdb1_get(argc, argv, obj)
  * Returns the value corresponding to +key+.
  */
 static VALUE
-bdb1_get_dyna(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+bdb1_get_dyna(int argc, VALUE *argv, VALUE obj)
 {
     return bdb1_get_internal(argc, argv, obj, Qnil, 1);
 }
 
 static VALUE
-bdb1_fetch(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_fetch(int argc, VALUE *argv, VALUE obj)
 {
     VALUE key, if_none;
     VALUE val;
@@ -1074,10 +1007,9 @@ bdb1_fetch(argc, argv, obj)
 }
 
 static VALUE
-bdb1_has_key(obj, key)
-    VALUE obj, key;
+bdb1_has_key(VALUE obj, VALUE key)
 {
-    return bdb1_get_internal(1, &key, obj, Qfalse);
+    return bdb1_get_internal(1, &key, obj, Qfalse, 0);
 }
 
 /*
@@ -1087,8 +1019,7 @@ bdb1_has_key(obj, key)
  * Returns +true+ if the association from +key+ is +value+.
  */
 static VALUE
-bdb1_has_both(obj, a, b)
-    VALUE obj, a, b;
+bdb1_has_both(VALUE obj, VALUE a, VALUE b)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1132,8 +1063,7 @@ bdb1_has_both(obj, a, b)
  * exist.
  */
 VALUE
-bdb1_del(obj, a)
-    VALUE a, obj;
+bdb1_del(VALUE obj, VALUE a)
 {
     bdb1_DB *dbst;
     DBT key;
@@ -1156,8 +1086,7 @@ bdb1_del(obj, a)
 }
 
 static VALUE
-bdb1_empty(obj)
-    VALUE obj;
+bdb1_empty(VALUE obj)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1176,8 +1105,7 @@ bdb1_empty(obj)
 }
 
 static VALUE
-bdb1_delete_if(obj)
-    VALUE obj;
+bdb1_delete_if(VALUE obj)
 {
     bdb1_DB *dbst;
     DBT key, data, save;
@@ -1203,8 +1131,7 @@ bdb1_delete_if(obj)
 }
 
 VALUE
-bdb1_clear(obj)
-    VALUE obj;
+bdb1_clear(VALUE obj)
 {
     bdb1_DB *dbst;
     DBT key, data, save;
@@ -1229,8 +1156,7 @@ bdb1_clear(obj)
 }
 
 static VALUE
-bdb1_length(obj)
-    VALUE obj;
+bdb1_length(VALUE obj)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1258,9 +1184,7 @@ bdb1_length(obj)
 }
 
 static VALUE
-bdb1_each_valuec(obj, sens, result)
-    VALUE obj, result;
-    int sens;
+bdb1_each_valuec(VALUE obj, VALUE sens, VALUE result)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1281,19 +1205,26 @@ bdb1_each_valuec(obj, sens, result)
 	FREE_KEY(dbst, key);
 	interm = bdb1_test_load(obj, &data, FILTER_VALUE);
         rest = rb_yield(interm);
-	if (result != Qnil && RTEST(rest)) {
+	if (!NIL_P(result) && RTEST(rest)) {
 	    rb_ary_push(result, interm);
 	}
     } while (1);
 }
 
-VALUE bdb1_each_value(obj) VALUE obj;{ return bdb1_each_valuec(obj, DB_NEXT, Qnil); }
-VALUE bdb1_each_eulav(obj) VALUE obj;{ return bdb1_each_valuec(obj, DB_PREV, Qnil); }
+VALUE
+bdb1_each_value(VALUE obj)
+{
+    return bdb1_each_valuec(obj, DB_NEXT, Qnil);
+}
+
+VALUE
+bdb1_each_eulav(VALUE obj)
+{
+    return bdb1_each_valuec(obj, DB_PREV, Qnil);
+}
 
 static VALUE
-bdb1_each_keyc(obj, sens)
-    VALUE obj;
-    int sens;
+bdb1_each_keyc(VALUE obj, int sens)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1315,13 +1246,20 @@ bdb1_each_keyc(obj, sens)
     return obj;
 }
 
-VALUE bdb1_each_key(obj) VALUE obj;{ return bdb1_each_keyc(obj, DB_NEXT); }
-static VALUE bdb1_each_yek(obj) VALUE obj;{ return bdb1_each_keyc(obj, DB_PREV); }
+VALUE
+bdb1_each_key(VALUE obj)
+{
+    return bdb1_each_keyc(obj, DB_NEXT);
+}
 
 static VALUE
-bdb1_each_common(obj, sens)
-    VALUE obj;
-    int sens;
+bdb1_each_yek(VALUE obj)
+{
+    return bdb1_each_keyc(obj, DB_PREV);
+}
+
+static VALUE
+bdb1_each_common(VALUE obj, int sens)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1343,12 +1281,20 @@ bdb1_each_common(obj, sens)
     return obj;
 }
 
-static VALUE bdb1_each_pair(obj) VALUE obj;{ return bdb1_each_common(obj, DB_NEXT); }
-static VALUE bdb1_each_riap(obj) VALUE obj;{ return bdb1_each_common(obj, DB_PREV); }
+static VALUE
+bdb1_each_pair(VALUE obj)
+{
+    return bdb1_each_common(obj, DB_NEXT);
+}
+
+static VALUE
+bdb1_each_riap(VALUE obj)
+{
+    return bdb1_each_common(obj, DB_PREV);
+}
 
 VALUE
-bdb1_to_type(obj, result, flag)
-    VALUE obj, result, flag;
+bdb1_to_type(VALUE obj, VALUE result, VALUE flag)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1358,7 +1304,7 @@ bdb1_to_type(obj, result, flag)
     GetDB(obj, dbst);
     INIT_RECNO(dbst, key, recno);
     DATA_ZERO(data);
-    flags = (flag == Qnil)?DB_LAST:DB_FIRST;
+    flags = NIL_P(flag) ? DB_LAST : DB_FIRST;
     do {
         ret = bdb1_test_error(dbst->dbp->seq(dbst->dbp, &key, &data, flags));
         if (ret == DB_NOTFOUND) {
@@ -1366,7 +1312,7 @@ bdb1_to_type(obj, result, flag)
         }
 	switch (TYPE(result)) {
 	case T_ARRAY:
-	    if (flag == Qtrue) {
+	    if (RTEST(flag)) {
 		rb_ary_push(result, bdb1_assoc(obj, &key, &data));
 	    }
 	    else {
@@ -1374,7 +1320,7 @@ bdb1_to_type(obj, result, flag)
 	    }
 	    break;
 	case T_HASH:
-	    if (flag == Qtrue) {
+	    if (RTEST(flag)) {
 		rb_hash_aset(result, test_load_key(obj, &key),
 			     bdb1_test_load(obj, &data, FILTER_VALUE));
 	    }
@@ -1383,35 +1329,31 @@ bdb1_to_type(obj, result, flag)
 			     test_load_key(obj, &key));
 	    }
 	}
-	flags = (flag == Qnil)?DB_PREV:DB_NEXT;
+	flags = NIL_P(flag) ? DB_PREV : DB_NEXT;
     } while (1);
     return result;
 }
 
 static VALUE
-bdb1_to_a(obj)
-    VALUE obj;
+bdb1_to_a(VALUE obj)
 {
     return bdb1_to_type(obj, rb_ary_new(), Qtrue);
 }
 
 static VALUE
-bdb1_invert(obj)
-    VALUE obj;
+bdb1_invert(VALUE obj)
 {
     return bdb1_to_type(obj, rb_hash_new(), Qfalse);
 }
 
 static VALUE
-bdb1_to_hash(obj)
-    VALUE obj;
+bdb1_to_hash(VALUE obj)
 {
     return bdb1_to_type(obj, rb_hash_new(), Qtrue);
 }
 
 static VALUE
-bdb1_each_kv(obj, a, result, flag)
-    VALUE obj, a, result, flag;
+bdb1_each_kv(VALUE obj, VALUE a, VALUE result, VALUE flag)
 {
     bdb1_DB *dbst;
     DBT keys, key, data;
@@ -1429,7 +1371,7 @@ bdb1_each_kv(obj, a, result, flag)
         ret = bdb1_test_error(dbst->dbp->seq(dbst->dbp, &key, &data, flags));
 	if (ret == DB_NOTFOUND || keys.size != key.size ||
 	    memcmp(keys.data, key.data, key.size) != 0) {
-	    return (result == Qnil)?obj:result;
+	    return NIL_P(result)?obj:result;
 	}
 	k =  bdb1_test_load(obj, &data, FILTER_VALUE);
 	if (RTEST(flag)) {
@@ -1455,9 +1397,7 @@ bdb1_each_kv(obj, a, result, flag)
  * If +assoc+ is +false+ return only the values.
  */
 static VALUE
-bdb1_bt_duplicates(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_bt_duplicates(int argc, VALUE *argv, VALUE obj)
 {
     VALUE a, b;
 
@@ -1474,8 +1414,7 @@ bdb1_bt_duplicates(argc, argv, obj)
  * Iterates over duplicate associations for the +key+.
  */
 static VALUE
-bdb1_bt_dup(obj, a)
-    VALUE a, obj;
+bdb1_bt_dup(VALUE obj, VALUE a)
 {
     return bdb1_each_kv(obj, a, Qnil, Qtrue);
 }
@@ -1487,22 +1426,19 @@ bdb1_bt_dup(obj, a)
  * Iterates over duplicate values for the +key+.
  */
 static VALUE
-bdb1_bt_dupval(obj, a)
-    VALUE a, obj;
+bdb1_bt_dupval(VALUE obj, VALUE a)
 {
     return bdb1_each_kv(obj, a, Qnil, Qfalse);
 }
 
 static VALUE
-bdb1_reject(obj)
-    VALUE obj;
+bdb1_reject(VALUE obj)
 {
     return rb_hash_delete_if(bdb1_to_hash(obj));
 }
 
 static VALUE
-bdb1_values(obj)
-    VALUE obj;
+bdb1_values(VALUE obj)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1528,9 +1464,7 @@ bdb1_values(obj)
 }
 
 VALUE
-bdb1_internal_value(obj, a, b, sens)
-    VALUE obj, a, b;
-    int sens;
+bdb1_internal_value(VALUE obj, VALUE a, VALUE b, int sens)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1541,64 +1475,38 @@ bdb1_internal_value(obj, a, b, sens)
     INIT_RECNO(dbst, key, recno);
     DATA_ZERO(data);
     flags = (sens == DB_NEXT)?DB_FIRST:DB_LAST;
-    do {
+    for (;;) {
         ret = bdb1_test_error(dbst->dbp->seq(dbst->dbp, &key, &data, flags));
 	if (ret == DB_NOTFOUND) {
-	    return (b == Qfalse)?Qfalse:Qnil;
+	    return RTEST(b) ? Qnil : Qfalse;
 	}
 	flags = sens;
-	if (rb_equal(a, bdb1_test_load(obj, &data, FILTER_VALUE)) == Qtrue) {
+	if (RTEST(rb_equal(a, bdb1_test_load(obj, &data, FILTER_VALUE)))) {
 	    VALUE d;
 
-	    d = (b == Qfalse)?Qtrue:test_load_key(obj, &key);
+	    d = RTEST(b) ? test_load_key(obj, &key) : Qtrue;
 	    FREE_KEY(dbst, key);
 	    return  d;
 	}
 	FREE_KEY(dbst, key);
-    } while (1);
-    return (b == Qfalse)?Qfalse:Qnil;
+    }
+    return RTEST(b) ? Qnil : Qfalse;
 }
 
 VALUE
-bdb1_index(obj, a)
-    VALUE obj, a;
+bdb1_key(VALUE obj, VALUE a)
 {
     return bdb1_internal_value(obj, a, Qtrue, DB_NEXT);
 }
 
-static VALUE
-bdb1_indexes(argc, argv, obj)
-    int argc;
-    VALUE obj, *argv;
-{
-    VALUE indexes;
-    int i;
-
-#if HAVE_RB_ARY_VALUES_AT
-    rb_warn("BDB1#%s is deprecated; use BDB1#values_at",
-#if HAVE_RB_FRAME_THIS_FUNC
-	    rb_id2name(rb_frame_this_func()));
-#else
-	    rb_id2name(rb_frame_last_func()));
-#endif
-#endif
-    indexes = rb_ary_new2(argc);
-    for (i = 0; i < argc; i++) {
-	rb_ary_push(indexes, bdb1_get(1, argv + i, obj));
-    }
-    return indexes;
-}
-
 VALUE
-bdb1_has_value(obj, a)
-    VALUE obj, a;
+bdb1_has_value(VALUE obj, VALUE a)
 {
     return bdb1_internal_value(obj, a, Qfalse, DB_NEXT);
 }
 
 static VALUE
-bdb1_keys(obj)
-    VALUE obj;
+bdb1_keys(VALUE obj)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1624,8 +1532,7 @@ bdb1_keys(obj)
 }
 
 static VALUE
-bdb1_sync(obj)
-    VALUE obj;
+bdb1_sync(VALUE obj)
 {
     bdb1_DB *dbst;
 
@@ -1636,12 +1543,8 @@ bdb1_sync(obj)
     return Qtrue;
 }
 
-#if HAVE_RB_ARY_VALUES_AT
-
 static VALUE
-bdb1_values_at(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_values_at(int argc, VALUE *argv, VALUE obj)
 {
     VALUE result = rb_ary_new2(argc);
     long i;
@@ -1652,34 +1555,19 @@ bdb1_values_at(argc, argv, obj)
     return result;
 }
 
-#endif
-
-#if HAVE_RB_ARY_SELECT
-
 static VALUE
-bdb1_select(argc, argv, obj)
-    int argc;
-    VALUE *argv, obj;
+bdb1_select(VALUE obj)
 {
     VALUE result = rb_ary_new();
-    long i;
 
     if (rb_block_given_p()) {
-	if (argc > 0) {
-	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
-	}
 	return bdb1_each_valuec(obj, DB_NEXT, result);
     }
-    rb_warn("Common#select(index..) is deprecated; use Common#values_at");
-    return bdb1_values_at(argc, argv, obj);
+    rb_raise(rb_eArgError, "block is not given");
 }
 
-#endif
-
 VALUE
-bdb1_each_vc(obj, replace, rtest)
-    VALUE obj;
-    int replace, rtest;
+bdb1_each_vc(VALUE obj, int replace, int rtest)
 {
     bdb1_DB *dbst;
     DBT key, data;
@@ -1709,7 +1597,7 @@ bdb1_each_vc(obj, replace, rtest)
 	else {
 	    rb_ary_push(result, res);
 	}
-	if (replace == Qtrue) {
+	if (RTEST(replace)) {
 	    DATA_ZERO(data);
 	    res = test_dump(obj, &data, res, FILTER_VALUE);
 	    bdb1_test_error(dbst->dbp->put(dbst->dbp, &key, &data, 0));
@@ -1749,7 +1637,7 @@ bdb1_each_vc(obj, replace, rtest)
  *
  */
 void
-Init_bdb1()
+Init_bdb1(void)
 {
     bdb1_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal"));
     id_dump = rb_intern("dump");
@@ -1789,11 +1677,7 @@ Init_bdb1()
     bdb1_cCommon = rb_define_class_under(bdb1_mDb, "Common", rb_cObject);
     rb_define_method(bdb1_cCommon, "initialize", bdb1_init, -1);
     rb_include_module(bdb1_cCommon, rb_mEnumerable);
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
     rb_define_alloc_func(bdb1_cCommon, bdb1_s_alloc);
-#else
-    rb_define_singleton_method(bdb1_cCommon, "allocate", bdb1_s_alloc, 0);
-#endif
     rb_define_singleton_method(bdb1_cCommon, "create", bdb1_s_create, -1);
     rb_define_singleton_method(bdb1_cCommon, "open", bdb1_s_open, -1);
     rb_define_singleton_method(bdb1_cCommon, "[]", bdb1_s_aref, -1);
@@ -1841,15 +1725,10 @@ Init_bdb1()
     rb_define_method(bdb1_cCommon, "empty?", bdb1_empty, 0);
     rb_define_method(bdb1_cCommon, "length", bdb1_length, 0);
     rb_define_alias(bdb1_cCommon,  "size", "length");
-    rb_define_method(bdb1_cCommon, "index", bdb1_index, 1);
-    rb_define_method(bdb1_cCommon, "indexes", bdb1_indexes, -1);
-    rb_define_method(bdb1_cCommon, "indices", bdb1_indexes, -1);
-#if HAVE_RB_ARY_SELECT
-    rb_define_method(bdb1_cCommon, "select", bdb1_select, -1);
-#endif
-#if HAVE_RB_ARY_VALUES_AT
+    rb_define_method(bdb1_cCommon, "key", bdb1_key, 1);
+    rb_define_method(bdb1_cCommon, "index", bdb1_key, 1);
+    rb_define_method(bdb1_cCommon, "select", bdb1_select, 0);
     rb_define_method(bdb1_cCommon, "values_at", bdb1_values_at, -1);
-#endif
     bdb1_cBtree = rb_define_class_under(bdb1_mDb, "Btree", bdb1_cCommon);
     rb_define_method(bdb1_cBtree, "duplicates", bdb1_bt_duplicates, -1);
     rb_define_method(bdb1_cBtree, "each_dup", bdb1_bt_dup, 1);