From 530e485265dac6e2aea1d587a4a79a314cc772cf Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 22 Dec 2021 14:29:05 +0900 Subject: `ID` in `rb_id_table_foreach_with_replace` [Feature #18253] Pass the `ID` from `rb_id_table_foreach_with_replace` to callback functions. --- id_table.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/id_table.c b/id_table.c index b2ba6fae89..281a0fb50a 100644 --- a/id_table.c +++ b/id_table.c @@ -274,12 +274,14 @@ rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_fu for (i=0; iitems[i].val, data); - assert(ITEM_GET_KEY(tbl, i)); + const id_key_t key = ITEM_GET_KEY(tbl, i); + ID id = key2id(key); + enum rb_id_table_iterator_result ret = (*func)(id, tbl->items[i].val, data); + assert(key != 0); if (ret == ID_TABLE_REPLACE) { VALUE val = tbl->items[i].val; - ret = (*replace)(NULL, &val, data, TRUE); + ret = (*replace)(&id, &val, data, TRUE); tbl->items[i].val = val; } else if (ret == ID_TABLE_STOP) -- cgit v1.2.1