diff --git a/src/tanabata/kazari.c b/src/tanabata/kazari.c index 95dc210..7cb968d 100644 --- a/src/tanabata/kazari.c +++ b/src/tanabata/kazari.c @@ -11,6 +11,10 @@ int tanabata_kazari_rem(Tanabata *tanabata, uint64_t sasa_id, uint64_t tanzaku_i } Tanzaku *tanabata_tanzaku_get_by_sasa(Tanabata *tanabata, uint64_t sasa_id) { + if (sasa_id == HOLE_ID) { + fprintf(stderr, "Failed to get tanzaku list: got hole ID\n"); + return NULL; + } Tanzaku *tanzaku_list = NULL; uint64_t tanzaku_count = 0; for (uint64_t i = 0; i < tanabata->shoppyou.size; i++) { @@ -29,6 +33,10 @@ Tanzaku *tanabata_tanzaku_get_by_sasa(Tanabata *tanabata, uint64_t sasa_id) { } Sasa *tanabata_sasa_get_by_tanzaku(Tanabata *tanabata, uint64_t tanzaku_id) { + if (tanzaku_id == HOLE_ID) { + fprintf(stderr, "Failed to get sasa list: got hole ID\n"); + return NULL; + } Sasa *sasa_list = NULL; uint64_t sasa_count = 0; for (uint64_t i = 0; i < tanabata->shoppyou.size; i++) { diff --git a/src/tanabata/sasa.c b/src/tanabata/sasa.c index 7291a5a..654cc1e 100644 --- a/src/tanabata/sasa.c +++ b/src/tanabata/sasa.c @@ -42,7 +42,7 @@ Sasa tanabata_sasa_get_by_id(Tanabata *tanabata, uint64_t sasa_id) { Sasa tanabata_sasa_get_by_path(Tanabata *tanabata, const char *path) { for (uint64_t i = 0; i < tanabata->sasahyou.size; i++) { - if (strcmp(tanabata->sasahyou.database[i].path, path) == 0) { + if (tanabata->sasahyou.database[i].id != HOLE_ID && strcmp(tanabata->sasahyou.database[i].path, path) == 0) { return tanabata->sasahyou.database[i]; } } diff --git a/src/tanabata/tanzaku.c b/src/tanabata/tanzaku.c index 42ca369..f889742 100644 --- a/src/tanabata/tanzaku.c +++ b/src/tanabata/tanzaku.c @@ -41,7 +41,7 @@ Tanzaku tanabata_tanzaku_get_by_id(Tanabata *tanabata, uint64_t tanzaku_id) { Tanzaku tanabata_tanzaku_get_by_name(Tanabata *tanabata, const char *name) { for (uint64_t i = 0; i < tanabata->sappyou.size; i++) { - if (strcmp(tanabata->sappyou.database[i].name, name) == 0) { + if (tanabata->sappyou.database[i].id != HOLE_ID && strcmp(tanabata->sappyou.database[i].name, name) == 0) { return tanabata->sappyou.database[i]; } }