From 0abf0ad19a09a7d643d9d64adcdb4d9b4d7fdbc1 Mon Sep 17 00:00:00 2001 From: bpc2003 Date: Wed, 9 Apr 2025 14:08:14 -0400 Subject: Added delkeys to main --- src/main.c | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index 8b2688b..9d37166 100644 --- a/src/main.c +++ b/src/main.c @@ -59,13 +59,7 @@ int main(int argc, char **argv) } free(cmd); - - for (int i = 0; i < list[0].len; ++i) { - int *indexes = getkeys(list, i); - for (int j = 0; indexes[j]; ++j) - delkey(list, i, list[i].tab[indexes[j]].key); - free(indexes); - } + delkeys(list, -1, NULL); free(list); exit(0); } @@ -150,33 +144,18 @@ int setkeys_main(tablist_t **list, int id, char **pairs, int plen) if (pairs == NULL || id < -1) return 1; for (int i = 0; i < plen; ++i) - setkeys(list, id, pairs[i]); + if(setkeys(list, id, pairs[i])) + return 2; return 0; } int delkeys_main(tablist_t **list, int id, char **keys, int klen) { - if (id > -1) { - if (keys == NULL) { - int *indexes = getkeys(*list, id); - for (int i = 0; indexes[i]; ++i) - if (delkey(*list, id, (*list)[id].tab[indexes[i]].key)) - return 1; - free(indexes); - } else { - for (int i = 0; i < klen; ++i) - if (delkey(*list, id, keys[i])) - return 1; - } - } else { - if (keys == NULL) - delkeys(*list, NULL); - else { - for (int i = 0; i < klen; ++i) - if (delkeys(*list, keys[i])) - return 1; - } - } + if (keys == NULL || id < -1) + return 1; + for (int i = 0; i < klen; ++i) + if(delkeys(*list, id, keys[i])) + return 2; return 0; } -- cgit v1.2.3