diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-14 02:33:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-14 02:33:50 +0000 |
| commit | b0af0592fdd9e9d4e4b863fde006d67ccefeac21 (patch) | |
| tree | 31806d2a972f2ad490dc87a6ceeda8974c6275ae /st.c | |
| parent | af5e21292c43e06ed072274d015239c79f0c33f7 (diff) | |
| download | ruby-b0af0592fdd9e9d4e4b863fde006d67ccefeac21.tar.gz | |
hash.c, st.c: fix for ST_CHECK
* hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected
by ST_CHECK.
* st.c (st_foreach_check): call with non-error argument in normal case.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'st.c')
| -rw-r--r-- | st.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -948,7 +948,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t val = PVAL(table, i); hash = PHASH(table, i); if (key == never) continue; - retval = (*func)(key, val, arg); + retval = (*func)(key, val, arg, 0); if (!table->entries_packed) { FIND_ENTRY(table, ptr, hash, i); if (retval == ST_CHECK) { @@ -987,7 +987,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t if (ptr->key == never) goto unpacked_continue; i = ptr->hash % table->num_bins; - retval = (*func)(ptr->key, ptr->record, arg); + retval = (*func)(ptr->key, ptr->record, arg, 0); unpacked: switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ @@ -1037,7 +1037,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) key = PKEY(table, i); val = PVAL(table, i); hash = PHASH(table, i); - retval = (*func)(key, val, arg); + retval = (*func)(key, val, arg, 0); if (!table->entries_packed) { FIND_ENTRY(table, ptr, hash, i); if (!ptr) return 0; @@ -1064,7 +1064,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) if (ptr != 0) { do { i = ptr->hash % table->num_bins; - retval = (*func)(ptr->key, ptr->record, arg); + retval = (*func)(ptr->key, ptr->record, arg, 0); unpacked: switch (retval) { case ST_CONTINUE: @@ -1105,7 +1105,7 @@ st_reverse_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) st_data_t key, val; key = PKEY(table, i); val = PVAL(table, i); - retval = (*func)(key, val, arg); + retval = (*func)(key, val, arg, 0); switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ for (j = 0; j < table->num_entries; j++) { |