From 24c9e3908488427eb05dff06de8133cb077b51c1 Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Thu, 2 Feb 2023 16:15:30 +0300 Subject: [PATCH] feat(core,lib): return new tanzaku when adding tanzaku or HOLE_TANZAKU on failure --- include/tanabata.h | 2 +- tanabata/core/core_func.h | 2 +- tanabata/core/sappyou.c | 6 +++--- tanabata/lib/tanzaku.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/tanabata.h b/include/tanabata.h index c945070..83b7f41 100644 --- a/include/tanabata.h +++ b/include/tanabata.h @@ -54,7 +54,7 @@ Sasa tanabata_sasa_get(Tanabata *tanabata, uint64_t sasa_id); // ==================== TANZAKU SECTION ==================== // // Add tanzaku -int tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description); +Tanzaku tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description); // Remove tanzaku by ID int tanabata_tanzaku_rem(Tanabata *tanabata, uint64_t tanzaku_id); diff --git a/tanabata/core/core_func.h b/tanabata/core/core_func.h index 17022d3..7c85832 100644 --- a/tanabata/core/core_func.h +++ b/tanabata/core/core_func.h @@ -64,7 +64,7 @@ int sappyou_open(Sappyou *sappyou, const char *path); int sappyou_dump(Sappyou *sappyou, const char *path); // Add new tanzaku to sappyou -int tanzaku_add(Sappyou *sappyou, const char *name, const char *description); +Tanzaku tanzaku_add(Sappyou *sappyou, const char *name, const char *description); // Remove tanzaku from sappyou int tanzaku_rem(Sappyou *sappyou, uint64_t tanzaku_id); diff --git a/tanabata/core/sappyou.c b/tanabata/core/sappyou.c index 0284031..1f07d94 100644 --- a/tanabata/core/sappyou.c +++ b/tanabata/core/sappyou.c @@ -150,9 +150,9 @@ int sappyou_dump(Sappyou *sappyou, const char *path) { return sappyou_save(sappyou); } -int tanzaku_add(Sappyou *sappyou, const char *name, const char *description) { +Tanzaku tanzaku_add(Sappyou *sappyou, const char *name, const char *description) { if (name == NULL || description == NULL || sappyou->size == -1 && sappyou->hole_cnt == 0) { - return 1; + return HOLE_TANZAKU; } Tanzaku newbie; newbie.created_ts = time(NULL); @@ -174,7 +174,7 @@ int tanzaku_add(Sappyou *sappyou, const char *name, const char *description) { sappyou->database[newbie.id] = newbie; } sappyou->modified_ts = newbie.created_ts; - return 0; + return newbie; } int tanzaku_rem(Sappyou *sappyou, uint64_t tanzaku_id) { diff --git a/tanabata/lib/tanzaku.c b/tanabata/lib/tanzaku.c index e829d20..b347575 100644 --- a/tanabata/lib/tanzaku.c +++ b/tanabata/lib/tanzaku.c @@ -1,7 +1,7 @@ #include "../core/core_func.h" #include "../../include/tanabata.h" -int tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description) { +Tanzaku tanabata_tanzaku_add(Tanabata *tanabata, const char *name, const char *description) { return tanzaku_add(&tanabata->sappyou, name, description); }