From bf4922114128ab71e18588a48aabc8ebc9abd155 Mon Sep 17 00:00:00 2001
From: Masahiko AMANO <hiko-19@ya.ru>
Date: Wed, 18 Jan 2023 23:50:24 +0300
Subject: [PATCH] fix(core): a little bug fix on loading/saving hyou

---
 tanabata/core/sappyou.c  | 6 +++---
 tanabata/core/sasahyou.c | 6 +++---
 tanabata/core/shoppyou.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tanabata/core/sappyou.c b/tanabata/core/sappyou.c
index 4f449bb..c3a7be6 100644
--- a/tanabata/core/sappyou.c
+++ b/tanabata/core/sappyou.c
@@ -33,8 +33,8 @@ int sappyou_free(Sappyou *sappyou) {
 }
 
 int sappyou_load(Sappyou *sappyou) {
-    sappyou->file = freopen(NULL, "rb", sappyou->file);
-    if (sappyou->file == NULL) {
+    if (sappyou->file == NULL ||
+        (sappyou->file = freopen(NULL, "rb", sappyou->file)) == 0) {
         return 1;
     }
     uint16_t signature[4];
@@ -68,8 +68,8 @@ int sappyou_load(Sappyou *sappyou) {
 }
 
 int sappyou_save(Sappyou *sappyou) {
-    sappyou->file = freopen(NULL, "wb", sappyou->file);
     if (sappyou->file == NULL ||
+        (sappyou->file = freopen(NULL, "wb", sappyou->file)) == NULL ||
         fwrite(SAPPYOU_SIG, 2, 4, sappyou->file) < 4 ||
         fwrite(&sappyou->created_ts, 8, 1, sappyou->file) == 0 ||
         fwrite(&sappyou->modified_ts, 8, 1, sappyou->file) == 0 ||
diff --git a/tanabata/core/sasahyou.c b/tanabata/core/sasahyou.c
index 4fca375..4c55fc1 100644
--- a/tanabata/core/sasahyou.c
+++ b/tanabata/core/sasahyou.c
@@ -34,8 +34,8 @@ int sasahyou_free(Sasahyou *sasahyou) {
 }
 
 int sasahyou_load(Sasahyou *sasahyou) {
-    sasahyou->file = freopen(NULL, "rb", sasahyou->file);
-    if (sasahyou->file == NULL) {
+    if (sasahyou->file == NULL ||
+        (sasahyou->file = freopen(NULL, "rb", sasahyou->file)) == 0) {
         return 1;
     }
     uint16_t signature[4];
@@ -67,8 +67,8 @@ int sasahyou_load(Sasahyou *sasahyou) {
 }
 
 int sasahyou_save(Sasahyou *sasahyou) {
-    sasahyou->file = freopen(NULL, "wb", sasahyou->file);
     if (sasahyou->file == NULL ||
+        (sasahyou->file = freopen(NULL, "wb", sasahyou->file)) == NULL ||
         fwrite(SASAHYOU_SIG, 2, 4, sasahyou->file) < 4 ||
         fwrite(&sasahyou->created_ts, 8, 1, sasahyou->file) == 0 ||
         fwrite(&sasahyou->modified_ts, 8, 1, sasahyou->file) == 0 ||
diff --git a/tanabata/core/shoppyou.c b/tanabata/core/shoppyou.c
index 10bc062..9dc4a7c 100644
--- a/tanabata/core/shoppyou.c
+++ b/tanabata/core/shoppyou.c
@@ -30,8 +30,8 @@ int shoppyou_free(Shoppyou *shoppyou) {
 }
 
 int shoppyou_load(Shoppyou *shoppyou) {
-    shoppyou->file = freopen(NULL, "rb", shoppyou->file);
-    if (shoppyou->file == NULL) {
+    if (shoppyou->file == NULL ||
+        (shoppyou->file = freopen(NULL, "rb", shoppyou->file)) == 0) {
         return 1;
     }
     uint16_t signature[4];
@@ -56,8 +56,8 @@ int shoppyou_load(Shoppyou *shoppyou) {
 }
 
 int shoppyou_save(Shoppyou *shoppyou) {
-    shoppyou->file = freopen(NULL, "wb", shoppyou->file);
     if (shoppyou->file == NULL ||
+        (shoppyou->file = freopen(NULL, "wb", shoppyou->file)) == NULL ||
         fwrite(SHOPPYOU_SIG, 2, 4, shoppyou->file) < 4 ||
         fwrite(&shoppyou->created_ts, 8, 1, shoppyou->file) == 0 ||
         fwrite(&shoppyou->modified_ts, 8, 1, shoppyou->file) == 0) {