From b5b2cc7fae514bd4774cf92371fe62da68004e9a Mon Sep 17 00:00:00 2001
From: Masahiko AMANO <hiko-19@ya.ru>
Date: Sun, 25 Dec 2022 01:21:48 +0300
Subject: [PATCH] style(lib): a bit of code cleanup

---
 src/tanabata/kazari.c  | 4 ++--
 src/tanabata/sasa.c    | 5 +----
 src/tanabata/tanzaku.c | 5 +----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/tanabata/kazari.c b/src/tanabata/kazari.c
index 5a051ad..9ee34d2 100644
--- a/src/tanabata/kazari.c
+++ b/src/tanabata/kazari.c
@@ -24,7 +24,7 @@ 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) {
+    if (sasa_id == HOLE_ID || sasa_id >= tanabata->sasahyou.size) {
         return NULL;
     }
     Tanzaku *tanzaku_list = NULL;
@@ -46,7 +46,7 @@ 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) {
+    if (tanzaku_id == HOLE_ID || tanzaku_id >= tanabata->sappyou.size) {
         return NULL;
     }
     Sasa *sasa_list = NULL;
diff --git a/src/tanabata/sasa.c b/src/tanabata/sasa.c
index 041769f..2cc2017 100644
--- a/src/tanabata/sasa.c
+++ b/src/tanabata/sasa.c
@@ -52,10 +52,7 @@ int tanabata_sasa_rem_by_path(Tanabata *tanabata, const char *path) {
 }
 
 Sasa tanabata_sasa_get_by_id(Tanabata *tanabata, uint64_t sasa_id) {
-    if (sasa_id == HOLE_ID) {
-        return HOLE_SASA;
-    }
-    if (sasa_id >= tanabata->sasahyou.size) {
+    if (sasa_id == HOLE_ID || sasa_id >= tanabata->sasahyou.size) {
         return HOLE_SASA;
     }
     return tanabata->sasahyou.database[sasa_id];
diff --git a/src/tanabata/tanzaku.c b/src/tanabata/tanzaku.c
index 3527dbb..0b25562 100644
--- a/src/tanabata/tanzaku.c
+++ b/src/tanabata/tanzaku.c
@@ -45,10 +45,7 @@ int tanabata_tanzaku_rem_by_name(Tanabata *tanabata, const char *name) {
 }
 
 Tanzaku tanabata_tanzaku_get_by_id(Tanabata *tanabata, uint64_t tanzaku_id) {
-    if (tanzaku_id == HOLE_ID) {
-        return HOLE_TANZAKU;
-    }
-    if (tanzaku_id >= tanabata->sappyou.size) {
+    if (tanzaku_id == HOLE_ID || tanzaku_id >= tanabata->sappyou.size) {
         return HOLE_TANZAKU;
     }
     return tanabata->sappyou.database[tanzaku_id];