From 8d8a105f8feb0823d429f84982f30a39ec87a0a1 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 9 Dec 2004 02:35:29 +0000 Subject: * ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132] * ext/sdbm/init.c: ditto. * ext/gdbm/gdbm.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/gdbm/gdbm.c | 101 +++++++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 63 deletions(-) (limited to 'ext/gdbm') diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index ac208efbe8..e59b01addf 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -44,6 +44,11 @@ closed_dbm() if (dbmp->di_dbm == 0) closed_dbm();\ } while (0) +#define GetDBM2(obj, data, dbm) {\ + GetDBM(obj, data);\ + (dbm) = dbmp->di_dbm;\ +} + static void free_dbm(dbmp) struct dbmdata *dbmp; @@ -202,8 +207,7 @@ rb_gdbm_fetch3(obj, keystr) struct dbmdata *dbmp; GDBM_FILE dbm; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); return rb_gdbm_fetch2(dbm, keystr); } @@ -299,8 +303,7 @@ fgdbm_index(obj, valstr) VALUE keystr, valstr2; StringValue(valstr); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { @@ -349,15 +352,16 @@ fgdbm_select(argc, argv, obj) if (argc > 0) { rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc); } - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)); + VALUE v = rb_yield(assoc); - if (RTEST(rb_yield(assoc))) - rb_ary_push(new, assoc); + if (RTEST(v)) { + rb_ary_push(new, assoc); + } + GetDBM2(obj, dbmp, dbm); } } else { @@ -408,9 +412,7 @@ rb_gdbm_delete(obj, keystr) key.dptr = RSTRING(keystr)->ptr; key.dsize = RSTRING(keystr)->len; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); if (!gdbm_exists(dbm, key)) { return Qnil; } @@ -445,9 +447,7 @@ fgdbm_shift(obj) VALUE keystr, valstr; rb_gdbm_modify(obj); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); keystr = rb_gdbm_firstkey(dbm); if (NIL_P(keystr)) return Qnil; valstr = rb_gdbm_fetch2(dbm, keystr); @@ -467,8 +467,7 @@ fgdbm_delete_if(obj) int i, status = 0, n; rb_gdbm_modify(obj); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); n = dbmp->di_size; dbmp->di_size = -1; @@ -479,6 +478,7 @@ fgdbm_delete_if(obj) ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status); if (status != 0) break; if (RTEST(ret)) rb_ary_push(ary, keystr); + GetDBM2(obj, dbmp, dbm); } for (i = 0; i < RARRAY(ary)->len; i++) @@ -498,8 +498,7 @@ fgdbm_clear(obj) GDBM_FILE dbm; rb_gdbm_modify(obj); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); dbmp->di_size = -1; #if 0 @@ -537,8 +536,7 @@ fgdbm_invert(obj) VALUE keystr, valstr; VALUE hash = rb_hash_new(); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { valstr = rb_gdbm_fetch2(dbm, keystr); @@ -606,9 +604,8 @@ fgdbm_store(obj, keystr, valstr) val.dptr = RSTRING(valstr)->ptr; val.dsize = RSTRING(valstr)->len; - GetDBM(obj, dbmp); + GetDBM2(obj, dbmp, dbm); dbmp->di_size = -1; - dbm = dbmp->di_dbm; if (gdbm_store(dbm, key, val, GDBM_REPLACE)) { if (errno == EPERM) rb_sys_fail(0); rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno)); @@ -626,9 +623,8 @@ fgdbm_length(obj) GDBM_FILE dbm; int i = 0; - GetDBM(obj, dbmp); + GetDBM2(obj, dbmp, dbm); if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size); - dbm = dbmp->di_dbm; for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) { nextkey = gdbm_nextkey(dbm, key); @@ -672,13 +668,12 @@ fgdbm_each_value(obj) GDBM_FILE dbm; VALUE keystr; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { rb_yield(rb_gdbm_fetch2(dbm, keystr)); + GetDBM2(obj, dbmp, dbm); } return obj; } @@ -691,13 +686,12 @@ fgdbm_each_key(obj) GDBM_FILE dbm; VALUE keystr; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { rb_yield(keystr); + GetDBM2(obj, dbmp, dbm); } return obj; } @@ -710,13 +704,12 @@ fgdbm_each_pair(obj) struct dbmdata *dbmp; VALUE keystr; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { rb_yield(rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr))); + GetDBM2(obj, dbmp, dbm); } return obj; @@ -730,9 +723,7 @@ fgdbm_keys(obj) GDBM_FILE dbm; VALUE keystr, ary; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); ary = rb_ary_new(); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { @@ -752,9 +743,7 @@ fgdbm_values(obj) GDBM_FILE dbm; VALUE valstr, ary; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); ary = rb_ary_new(); for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) { nextkey = gdbm_nextkey(dbm, key); @@ -778,8 +767,7 @@ fgdbm_has_key(obj, keystr) key.dptr = RSTRING(keystr)->ptr; key.dsize = RSTRING(keystr)->len; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); if (gdbm_exists(dbm, key)) return Qtrue; return Qfalse; @@ -794,8 +782,7 @@ fgdbm_has_value(obj, valstr) VALUE keystr, valstr2; StringValue(valstr); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { @@ -819,9 +806,7 @@ fgdbm_to_a(obj) GDBM_FILE dbm; VALUE keystr, ary; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); ary = rb_ary_new(); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { @@ -840,8 +825,7 @@ fgdbm_reorganize(obj) GDBM_FILE dbm; rb_gdbm_modify(obj); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); gdbm_reorganize(dbm); return obj; } @@ -854,8 +838,7 @@ fgdbm_sync(obj) GDBM_FILE dbm; rb_gdbm_modify(obj); - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; + GetDBM2(obj, dbmp, dbm); gdbm_sync(dbm); return obj; } @@ -868,9 +851,7 @@ fgdbm_set_cachesize(obj, val) GDBM_FILE dbm; int optval; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); optval = FIX2INT(val); if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) { rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno)); @@ -886,9 +867,7 @@ fgdbm_set_fastmode(obj, val) GDBM_FILE dbm; int optval; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); optval = 0; if (RTEST(val)) optval = 1; @@ -911,9 +890,7 @@ fgdbm_set_syncmode(obj, val) GDBM_FILE dbm; int optval; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); optval = 0; if (RTEST(val)) optval = 1; @@ -933,9 +910,7 @@ fgdbm_to_hash(obj) GDBM_FILE dbm; VALUE keystr, hash; - GetDBM(obj, dbmp); - dbm = dbmp->di_dbm; - + GetDBM2(obj, dbmp, dbm); hash = rb_hash_new(); for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr); keystr = rb_gdbm_nextkey(dbm, keystr)) { -- cgit v1.2.3