diff options
Diffstat (limited to 'st.c')
| -rw-r--r-- | st.c | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -1091,10 +1091,10 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) return 0; } -st_index_t -st_keys(st_table *table, st_data_t *keys, st_index_t size) +static st_index_t +get_keys(st_table *table, st_data_t *keys, st_index_t size, int check, st_data_t never) { - st_data_t key, never = (st_data_t)Qundef; + st_data_t key; st_data_t *keys_start = keys; if (table->entries_packed) { @@ -1103,23 +1103,35 @@ st_keys(st_table *table, st_data_t *keys, st_index_t size) if (size > table->real_entries) size = table->real_entries; for (i = 0; i < size; i++) { key = PKEY(table, i); - if (key == never) continue; + if (check && key == never) continue; *keys++ = key; } } else { st_table_entry *ptr = table->head; st_data_t *keys_end = keys + size; - while (ptr && keys < keys_end) { + for (; ptr && keys < keys_end; ptr = ptr->fore) { key = ptr->key; - if (key != never) *keys++ = key; - ptr = ptr->fore; + if (check && key == never) continue; + *keys++ = key; } } return keys - keys_start; } +st_index_t +st_keys(st_table *table, st_data_t *keys, st_index_t size) +{ + return get_keys(table, keys, size, 0, 0); +} + +st_index_t +st_keys_check(st_table *table, st_data_t *keys, st_index_t size, st_data_t never) +{ + return get_keys(table, keys, size, 1, never); +} + #if 0 /* unused right now */ int st_reverse_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) |