From 8768d55b48cf69fe47554b34df9d00fa90d5e7c5 Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Fri, 20 Jan 2023 15:58:27 +0300 Subject: [PATCH] feat(lib): remove sasa get/remove by path and tanzaku get/remove by name functions --- include/tanabata.h | 12 ------------ tanabata/lib/sasa.c | 32 -------------------------------- tanabata/lib/tanzaku.c | 32 -------------------------------- 3 files changed, 76 deletions(-) diff --git a/include/tanabata.h b/include/tanabata.h index 8e9b959..f4c5c16 100644 --- a/include/tanabata.h +++ b/include/tanabata.h @@ -45,18 +45,12 @@ int tanabata_sasa_add(Tanabata *tanabata, const char *path); // Remove sasa by ID int tanabata_sasa_rem_by_id(Tanabata *tanabata, uint64_t sasa_id); -// Remove sasa by file path -int tanabata_sasa_rem_by_path(Tanabata *tanabata, const char *path); - // Update sasa file path int tanabata_sasa_upd(Tanabata *tanabata, uint64_t sasa_id, const char *path); // Get sasa by ID Sasa tanabata_sasa_get_by_id(Tanabata *tanabata, uint64_t sasa_id); -// Get sasa by file path -Sasa tanabata_sasa_get_by_path(Tanabata *tanabata, const char *path); - // ==================== TANZAKU SECTION ==================== // // Add tanzaku @@ -65,18 +59,12 @@ int tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *descr // Remove tanzaku by ID int tanabata_tanzaku_rem_by_id(Tanabata *tanabata, uint64_t tanzaku_id); -// Remove tanzaku by name -int tanabata_tanzaku_rem_by_name(Tanabata *tanabata, const char *name); - // Update tanzaku name and description int tanabata_tanzaku_upd(Tanabata *tanabata, uint64_t tanzaku_id, const char *name, const char *description); // Get tanzaku by ID Tanzaku tanabata_tanzaku_get_by_id(Tanabata *tanabata, uint64_t tanzaku_id); -// Get tanzaku by name -Tanzaku tanabata_tanzaku_get_by_name(Tanabata *tanabata, const char *name); - // ==================== KAZARI SECTION ==================== // // Add kazari diff --git a/tanabata/lib/sasa.c b/tanabata/lib/sasa.c index 736991e..494e41d 100644 --- a/tanabata/lib/sasa.c +++ b/tanabata/lib/sasa.c @@ -29,24 +29,6 @@ int tanabata_sasa_rem_by_id(Tanabata *tanabata, uint64_t sasa_id) { return 1; } -int tanabata_sasa_rem_by_path(Tanabata *tanabata, const char *path) { - if (tanabata->sasahyou.size == 0 || path == NULL) { - return 1; - } - Sasa *current_sasa = tanabata->sasahyou.database; - for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) { - if (current_sasa->id != HOLE_ID && strcmp(current_sasa->path, path) == 0) { - if (sasa_rem(&tanabata->sasahyou, current_sasa->id) == 0 && - kazari_rem_by_sasa(&tanabata->shoppyou, current_sasa->id) == 0) { - return 0; - } - return 1; - } - current_sasa++; - } - return 1; -} - int tanabata_sasa_upd(Tanabata *tanabata, uint64_t sasa_id, const char *path) { return sasa_upd(&tanabata->sasahyou, sasa_id, path); } @@ -57,17 +39,3 @@ Sasa tanabata_sasa_get_by_id(Tanabata *tanabata, uint64_t sasa_id) { } return tanabata->sasahyou.database[sasa_id]; } - -Sasa tanabata_sasa_get_by_path(Tanabata *tanabata, const char *path) { - if (path == NULL) { - return HOLE_SASA; - } - Sasa *current_sasa = tanabata->sasahyou.database; - for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) { - if (current_sasa->id != HOLE_ID && strcmp(current_sasa->path, path) == 0) { - return *current_sasa; - } - current_sasa++; - } - return HOLE_SASA; -} diff --git a/tanabata/lib/tanzaku.c b/tanabata/lib/tanzaku.c index cdfd5b7..2ad43a5 100644 --- a/tanabata/lib/tanzaku.c +++ b/tanabata/lib/tanzaku.c @@ -28,24 +28,6 @@ int tanabata_tanzaku_rem_by_id(Tanabata *tanabata, uint64_t tanzaku_id) { return 1; } -int tanabata_tanzaku_rem_by_name(Tanabata *tanabata, const char *name) { - if (tanabata->sasahyou.size == 0 || name == NULL) { - return 1; - } - Tanzaku *current_tanzaku = tanabata->sappyou.database + 1; - for (uint64_t i = 1; i < tanabata->sappyou.size; i++) { - if (current_tanzaku->id != HOLE_ID && strcmp(current_tanzaku->name, name) == 0) { - if (tanzaku_rem(&tanabata->sappyou, current_tanzaku->id) == 0 && - kazari_rem_by_tanzaku(&tanabata->shoppyou, current_tanzaku->id) == 0) { - return 0; - } - return 1; - } - current_tanzaku++; - } - return 1; -} - int tanabata_tanzaku_upd(Tanabata *tanabata, uint64_t tanzaku_id, const char *name, const char *description) { return tanzaku_upd(&tanabata->sappyou, tanzaku_id, name, description); } @@ -56,17 +38,3 @@ Tanzaku tanabata_tanzaku_get_by_id(Tanabata *tanabata, uint64_t tanzaku_id) { } return tanabata->sappyou.database[tanzaku_id]; } - -Tanzaku tanabata_tanzaku_get_by_name(Tanabata *tanabata, const char *name) { - if (name == NULL) { - return HOLE_TANZAKU; - } - Tanzaku *current_tanzaku = tanabata->sappyou.database; - for (uint64_t i = 0; i < tanabata->sappyou.size; i++) { - if (current_tanzaku->id != HOLE_ID && strcmp(current_tanzaku->name, name) == 0) { - return tanabata->sappyou.database[i]; - } - current_tanzaku++; - } - return HOLE_TANZAKU; -}