From 1f454f67708b806589af285eb6b4117d1cd6ec05 Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Fri, 23 Dec 2022 14:46:05 +0300 Subject: [PATCH] feat(core): leave remove functions only by ID --- include/core.h | 17 ++++------------- src/core/sappyou.c | 42 +----------------------------------------- src/core/sasahyou.c | 22 +--------------------- 3 files changed, 6 insertions(+), 75 deletions(-) diff --git a/include/core.h b/include/core.h index 7038b13..c291bb4 100644 --- a/include/core.h +++ b/include/core.h @@ -109,11 +109,8 @@ int sasahyou_dump(Sasahyou *sasahyou, const char *path); // Add sasa to sasahyou int sasa_add(Sasahyou *sasahyou, const char *path); -// Remove sasa from sasahyou by ID -int sasa_rem_by_id(Sasahyou *sasahyou, uint64_t sasa_id); - -// Remove sasa from sasahyou by file path -int sasa_rem_by_path(Sasahyou *sasahyou, const char *path); +// Remove sasa from sasahyou +int sasa_rem(Sasahyou *sasahyou, uint64_t sasa_id); // ==================== SAPPYOU SECTION ==================== // @@ -138,14 +135,8 @@ int sappyou_dump(Sappyou *sappyou, const char *path); // Add new tanzaku to sappyou int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const char *description); -// Remove tanzaku from sappyou by ID -int tanzaku_rem_by_id(Sappyou *sappyou, uint64_t tanzaku_id); - -// Remove tanzaku from sappyou by name -int tanzaku_rem_by_name(Sappyou *sappyou, const char *name); - -// Remove tanzaku from sappyou by alias -int tanzaku_rem_by_alias(Sappyou *sappyou, const char *alias); +// Remove tanzaku from sappyou +int tanzaku_rem(Sappyou *sappyou, uint64_t tanzaku_id); // ==================== SHOPPYOU SECTION ==================== // diff --git a/src/core/sappyou.c b/src/core/sappyou.c index 753ba97..65182fd 100644 --- a/src/core/sappyou.c +++ b/src/core/sappyou.c @@ -152,7 +152,7 @@ int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const cha return 0; } -int tanzaku_rem_by_id(Sappyou *sappyou, uint64_t tanzaku_id) { +int tanzaku_rem(Sappyou *sappyou, uint64_t tanzaku_id) { if (tanzaku_id == HOLE_ID) { fprintf(stderr, "Failed to remove tanzaku: got hole ID\n"); return 1; @@ -172,43 +172,3 @@ int tanzaku_rem_by_id(Sappyou *sappyou, uint64_t tanzaku_id) { sappyou->modified_ts = time(NULL); return 0; } - -int tanzaku_rem_by_name(Sappyou *sappyou, const char *name) { - for (uint64_t i = 0; i < sappyou->size; i++) { - if (strcmp(sappyou->database[i].name, name) == 0) { - if (sappyou->database[i].id != HOLE_ID) { - sappyou->database[i].id = HOLE_ID; - sappyou->hole_cnt++; - sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); - sappyou->holes[sappyou->hole_cnt - 1] = sappyou->database + i; - sappyou->modified_ts = time(NULL); - return 0; - } else { - fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); - return 1; - } - } - } - fprintf(stderr, "Failed to remove tanzaku: target tanzaku does not exist\n"); - return 1; -} - -int tanzaku_rem_by_alias(Sappyou *sappyou, const char *alias) { - for (uint64_t i = 0; i < sappyou->size; i++) { - if (strcmp(sappyou->database[i].alias, alias) == 0) { - if (sappyou->database[i].id != HOLE_ID) { - sappyou->database[i].id = HOLE_ID; - sappyou->hole_cnt++; - sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); - sappyou->holes[sappyou->hole_cnt - 1] = sappyou->database + i; - sappyou->modified_ts = time(NULL); - return 0; - } else { - fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); - return 1; - } - } - } - fprintf(stderr, "Failed to remove tanzaku: target tanzaku does not exist\n"); - return 1; -} diff --git a/src/core/sasahyou.c b/src/core/sasahyou.c index 01d994f..282ccaf 100644 --- a/src/core/sasahyou.c +++ b/src/core/sasahyou.c @@ -135,7 +135,7 @@ int sasa_add(Sasahyou *sasahyou, const char *path) { return 0; } -int sasa_rem_by_id(Sasahyou *sasahyou, uint64_t sasa_id) { +int sasa_rem(Sasahyou *sasahyou, uint64_t sasa_id) { if (sasa_id == HOLE_ID) { fprintf(stderr, "Failed to remove sasa: got hole ID\n"); return 1; @@ -155,23 +155,3 @@ int sasa_rem_by_id(Sasahyou *sasahyou, uint64_t sasa_id) { sasahyou->modified_ts = time(NULL); return 0; } - -int sasa_rem_by_path(Sasahyou *sasahyou, const char *path) { - for (uint64_t i = 0; i < sasahyou->size; i++) { - if (strcmp(sasahyou->database[i].path, path) == 0) { - if (sasahyou->database[i].id != HOLE_ID) { - sasahyou->database[i].id = HOLE_ID; - sasahyou->hole_cnt++; - sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); - sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->database + i; - sasahyou->modified_ts = time(NULL); - return 0; - } else { - fprintf(stderr, "Failed to remove sasa: target sasa is already removed\n"); - return 1; - } - } - } - fprintf(stderr, "Failed to remove sasa: target sasa does not exist\n"); - return 1; -}