st.c : remove call to iter function with error argument cause it is n…

…ot used It is not used in hash.c since 2005-03-04
ruby · funny-falcon · Mar 24, 2012 · Mar 24, 2012 · Mar 24, 2012 · Mar 18, 2012
commit e8be459195242d99b8b2a370d490dfb5a20333b6
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
@@ -42,10 +42,9 @@ numhash_aset(VALUE self, VALUE key, VALUE data)
 }
 
 static int
-numhash_i(st_data_t key, st_data_t value, st_data_t arg, int error)
+numhash_i(st_data_t key, st_data_t value, st_data_t arg)
 {
     VALUE ret;
-    if (key == 0 && value == 0 && error == 1) rb_raise(rb_eRuntimeError, "numhash modified");
     ret = rb_yield_values(3, (VALUE)key, (VALUE)value, (VALUE)arg);
     if (ret == Qtrue) return ST_CHECK;
     return ST_CONTINUE;

diff --git a/hash.c b/hash.c
@@ -145,7 +145,7 @@ struct hash_foreach_arg {
 };
 
 static int
-hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int err)
+hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp)
 {
     struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
     int status;

diff --git a/st.c b/st.c
@@ -905,7 +905,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
 	    if (!table->entries_packed) {
 		FIND_ENTRY(table, ptr, hash, i);
 		if (retval == ST_CHECK) {
-		    if (!ptr) goto deleted;
+		    if (!ptr) return 1;
 		    goto unpacked_continue;
 		}
 		goto unpacked;
@@ -917,7 +917,7 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
 		}
 		i = find_packed_index(table, hash, key);
 		if (i == table->real_entries) {
-		    goto deleted;
+		    return 1;
 		}
 		/* fall through */
 	      case ST_CONTINUE:
@@ -947,9 +947,6 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
 	      case ST_CHECK:	/* check if hash is modified during iteration */
 		for (tmp = table->bins[i]; tmp != ptr; tmp = tmp->next) {
 		    if (!tmp) {
-		      deleted:
-			/* call func with error notice */
-			retval = (*func)(0, 0, arg, 1);
 			return 1;
 		    }
 		}