1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (st_foreach_func, rb_foreach_func): typedefed.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-08-21 04:57:06 +00:00
parent 1be6cc2388
commit 2b1cbac0ed
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Tue Aug 21 13:46:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Aug 21 13:57:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (st_foreach_func, rb_foreach_func): typedefed.
* hash.c (rb_hash_clear): use st_clear() unless iterating. * hash.c (rb_hash_clear): use st_clear() unless iterating.

12
hash.c
View File

@ -99,9 +99,11 @@ static const struct st_hash_type objhash = {
rb_any_hash, rb_any_hash,
}; };
typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
struct foreach_safe_arg { struct foreach_safe_arg {
st_table *tbl; st_table *tbl;
int (*func)(); st_foreach_func *func;
st_data_t arg; st_data_t arg;
}; };
@ -124,16 +126,18 @@ st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
struct foreach_safe_arg arg; struct foreach_safe_arg arg;
arg.tbl = table; arg.tbl = table;
arg.func = func; arg.func = (st_foreach_func *)func;
arg.arg = a; arg.arg = a;
if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) { if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
rb_raise(rb_eRuntimeError, "hash modified during iteration"); rb_raise(rb_eRuntimeError, "hash modified during iteration");
} }
} }
typedef int rb_foreach_func(VALUE, VALUE, VALUE);
struct hash_foreach_arg { struct hash_foreach_arg {
VALUE hash; VALUE hash;
int (*func)(); rb_foreach_func *func;
VALUE arg; VALUE arg;
}; };
@ -191,7 +195,7 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
RHASH(hash)->iter_lev++; RHASH(hash)->iter_lev++;
arg.hash = hash; arg.hash = hash;
arg.func = func; arg.func = (rb_foreach_func *)func;
arg.arg = farg; arg.arg = farg;
rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash); rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
} }