From 5b21e94bebed90180d8ff63dad03b8b948361089 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 21 Jul 2022 09:23:58 -0700 Subject: Expand tabs [ci skip] [Misc #18891] --- id_table.c | 138 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) (limited to 'id_table.c') diff --git a/id_table.c b/id_table.c index a1b09ba0ed..a9a041b955 100644 --- a/id_table.c +++ b/id_table.c @@ -85,9 +85,9 @@ rb_id_table_init(struct rb_id_table *tbl, int capa) { MEMZERO(tbl, struct rb_id_table, 1); if (capa > 0) { - capa = round_capa(capa); - tbl->capa = (int)capa; - tbl->items = ZALLOC_N(item_t, capa); + capa = round_capa(capa); + tbl->capa = (int)capa; + tbl->items = ZALLOC_N(item_t, capa); } return tbl; } @@ -130,16 +130,16 @@ static int hash_table_index(struct rb_id_table* tbl, id_key_t key) { if (tbl->capa > 0) { - int mask = tbl->capa - 1; - int ix = key & mask; - int d = 1; - while (key != ITEM_GET_KEY(tbl, ix)) { - if (!ITEM_COLLIDED(tbl, ix)) - return -1; - ix = (ix + d) & mask; - d++; - } - return ix; + int mask = tbl->capa - 1; + int ix = key & mask; + int d = 1; + while (key != ITEM_GET_KEY(tbl, ix)) { + if (!ITEM_COLLIDED(tbl, ix)) + return -1; + ix = (ix + d) & mask; + d++; + } + return ix; } return -1; } @@ -152,13 +152,13 @@ hash_table_raw_insert(struct rb_id_table *tbl, id_key_t key, VALUE val) int d = 1; assert(key != 0); while (ITEM_KEY_ISSET(tbl, ix)) { - ITEM_SET_COLLIDED(tbl, ix); - ix = (ix + d) & mask; - d++; + ITEM_SET_COLLIDED(tbl, ix); + ix = (ix + d) & mask; + d++; } tbl->num++; if (!ITEM_COLLIDED(tbl, ix)) { - tbl->used++; + tbl->used++; } ITEM_SET_KEY(tbl, ix, key); tbl->items[ix].val = val; @@ -168,16 +168,16 @@ static int hash_delete_index(struct rb_id_table *tbl, int ix) { if (ix >= 0) { - if (!ITEM_COLLIDED(tbl, ix)) { - tbl->used--; - } - tbl->num--; - ITEM_SET_KEY(tbl, ix, 0); - tbl->items[ix].val = 0; - return TRUE; + if (!ITEM_COLLIDED(tbl, ix)) { + tbl->used--; + } + tbl->num--; + ITEM_SET_KEY(tbl, ix, 0); + tbl->items[ix].val = 0; + return TRUE; } else { - return FALSE; + return FALSE; } } @@ -185,24 +185,24 @@ static void hash_table_extend(struct rb_id_table* tbl) { if (tbl->used + (tbl->used >> 1) >= tbl->capa) { - int new_cap = round_capa(tbl->num + (tbl->num >> 1)); - int i; - item_t* old; - struct rb_id_table tmp_tbl = {0, 0, 0}; - if (new_cap < tbl->capa) { - new_cap = round_capa(tbl->used + (tbl->used >> 1)); - } - tmp_tbl.capa = new_cap; - tmp_tbl.items = ZALLOC_N(item_t, new_cap); - for (i = 0; i < tbl->capa; i++) { - id_key_t key = ITEM_GET_KEY(tbl, i); - if (key != 0) { - hash_table_raw_insert(&tmp_tbl, key, tbl->items[i].val); - } - } - old = tbl->items; - *tbl = tmp_tbl; - xfree(old); + int new_cap = round_capa(tbl->num + (tbl->num >> 1)); + int i; + item_t* old; + struct rb_id_table tmp_tbl = {0, 0, 0}; + if (new_cap < tbl->capa) { + new_cap = round_capa(tbl->used + (tbl->used >> 1)); + } + tmp_tbl.capa = new_cap; + tmp_tbl.items = ZALLOC_N(item_t, new_cap); + for (i = 0; i < tbl->capa; i++) { + id_key_t key = ITEM_GET_KEY(tbl, i); + if (key != 0) { + hash_table_raw_insert(&tmp_tbl, key, tbl->items[i].val); + } + } + old = tbl->items; + *tbl = tmp_tbl; + xfree(old); } } @@ -216,9 +216,9 @@ hash_table_show(struct rb_id_table *tbl) fprintf(stderr, "tbl: %p (capa: %d, num: %d, used: %d)\n", tbl, tbl->capa, tbl->num, tbl->used); for (i=0; i [%d] %s %d\n", i, rb_id2name(key2id(keys[i])), (int)keys[i]); - } + if (ITEM_KEY_ISSET(tbl, i)) { + fprintf(stderr, " -> [%d] %s %d\n", i, rb_id2name(key2id(keys[i])), (int)keys[i]); + } } } #endif @@ -231,10 +231,10 @@ rb_id_table_lookup(struct rb_id_table *tbl, ID id, VALUE *valp) if (index >= 0) { *valp = tbl->items[index].val; - return TRUE; + return TRUE; } else { - return FALSE; + return FALSE; } } @@ -244,11 +244,11 @@ rb_id_table_insert_key(struct rb_id_table *tbl, const id_key_t key, const VALUE const int index = hash_table_index(tbl, key); if (index >= 0) { - tbl->items[index].val = val; + tbl->items[index].val = val; } else { - hash_table_extend(tbl); - hash_table_raw_insert(tbl, key, val); + hash_table_extend(tbl); + hash_table_raw_insert(tbl, key, val); } return TRUE; } @@ -273,16 +273,16 @@ rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, v int i, capa = tbl->capa; for (i=0; iitems[i].val, data); - assert(key != 0); - - if (ret == ID_TABLE_DELETE) - hash_delete_index(tbl, i); - else if (ret == ID_TABLE_STOP) - return; - } + if (ITEM_KEY_ISSET(tbl, i)) { + const id_key_t key = ITEM_GET_KEY(tbl, i); + enum rb_id_table_iterator_result ret = (*func)(key2id(key), tbl->items[i].val, data); + assert(key != 0); + + if (ret == ID_TABLE_DELETE) + hash_delete_index(tbl, i); + else if (ret == ID_TABLE_STOP) + return; + } } } @@ -292,14 +292,14 @@ rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_f int i, capa = tbl->capa; for (i=0; iitems[i].val, data); - - if (ret == ID_TABLE_DELETE) - hash_delete_index(tbl, i); - else if (ret == ID_TABLE_STOP) - return; - } + if (ITEM_KEY_ISSET(tbl, i)) { + enum rb_id_table_iterator_result ret = (*func)(tbl->items[i].val, data); + + if (ret == ID_TABLE_DELETE) + hash_delete_index(tbl, i); + else if (ret == ID_TABLE_STOP) + return; + } } } -- cgit v1.2.1