H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(lib): a bit of code cleanup

Browse Source
This commit is contained in:
Masahiko AMANO 2022-12-25 01:21:48 +03:00
parent 9cbb34512b
commit b5b2cc7fae
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tanabata/kazari.c
View File

@ -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) { 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; return NULL;
} }
Tanzaku *tanzaku_list = 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) { 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; return NULL;
} }
Sasa *sasa_list = NULL; Sasa *sasa_list = NULL;

5
src/tanabata/sasa.c
View File

@ -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) { Sasa tanabata_sasa_get_by_id(Tanabata *tanabata, uint64_t sasa_id) {
if (sasa_id == HOLE_ID) { if (sasa_id == HOLE_ID || sasa_id >= tanabata->sasahyou.size) {
return HOLE_SASA;
}
if (sasa_id >= tanabata->sasahyou.size) {
return HOLE_SASA; return HOLE_SASA;
} }
return tanabata->sasahyou.database[sasa_id]; return tanabata->sasahyou.database[sasa_id];

5
src/tanabata/tanzaku.c
View File

@ -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) { Tanzaku tanabata_tanzaku_get_by_id(Tanabata *tanabata, uint64_t tanzaku_id) {
if (tanzaku_id == HOLE_ID) { if (tanzaku_id == HOLE_ID || tanzaku_id >= tanabata->sappyou.size) {
return HOLE_TANZAKU;
}
if (tanzaku_id >= tanabata->sappyou.size) {
return HOLE_TANZAKU; return HOLE_TANZAKU;
} }
return tanabata->sappyou.database[tanzaku_id]; return tanabata->sappyou.database[tanzaku_id];