From 8dd436184641a6a8328e9747fdd053139fe69db4 Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Sat, 24 Dec 2022 16:45:59 +0300 Subject: [PATCH] fix(core): correct error handling --- src/core/sappyou.c | 11 +++++------ src/core/sasahyou.c | 11 +++++------ src/core/shoppyou.c | 11 +++++------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/core/sappyou.c b/src/core/sappyou.c index 0bd84b0..43fb8ea 100644 --- a/src/core/sappyou.c +++ b/src/core/sappyou.c @@ -34,7 +34,7 @@ int sappyou_free(Sappyou *sappyou) { int sappyou_load(Sappyou *sappyou) { if (sappyou->file == NULL) { - fprintf(stderr, "Failed to load sappyou: file not specified\n"); + fprintf(stderr, "Failed to load sappyou: input file not specified\n"); return 1; } uint16_t signature[4]; @@ -69,7 +69,7 @@ int sappyou_load(Sappyou *sappyou) { int sappyou_save(Sappyou *sappyou) { if (sappyou->file == NULL) { - fprintf(stderr, "Failed to save sappyou: file not specified\n"); + fprintf(stderr, "Failed to save sappyou: output file not specified\n"); return 1; } rewind(sappyou->file); @@ -99,7 +99,7 @@ int sappyou_save(Sappyou *sappyou) { int sappyou_open(Sappyou *sappyou, const char *path) { sappyou->file = fopen(path, "r+b"); if (sappyou->file == NULL) { - fprintf(stderr, "Failed to dump sappyou: failed to open file\n"); + fprintf(stderr, "Failed to open sappyou: failed to open file '%s'\n", path); return 1; } return sappyou_load(sappyou); @@ -108,7 +108,7 @@ int sappyou_open(Sappyou *sappyou, const char *path) { int sappyou_dump(Sappyou *sappyou, const char *path) { sappyou->file = fopen(path, "w+b"); if (sappyou->file == NULL) { - fprintf(stderr, "Failed to dump sappyou: failed to open file\n"); + fprintf(stderr, "Failed to dump sappyou: failed to write to file '%s'\n", path); return 1; } return sappyou_save(sappyou); @@ -156,8 +156,7 @@ int tanzaku_rem(Sappyou *sappyou, uint64_t tanzaku_id) { return 1; } if (sappyou->database[tanzaku_id].id == HOLE_ID) { - fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); - return 1; + return 0; } sappyou->database[tanzaku_id].id = HOLE_ID; sappyou->hole_cnt++; diff --git a/src/core/sasahyou.c b/src/core/sasahyou.c index f6c4f35..b2c5787 100644 --- a/src/core/sasahyou.c +++ b/src/core/sasahyou.c @@ -35,7 +35,7 @@ int sasahyou_free(Sasahyou *sasahyou) { int sasahyou_load(Sasahyou *sasahyou) { if (sasahyou->file == NULL) { - fprintf(stderr, "Failed to load sasahyou: file not specified\n"); + fprintf(stderr, "Failed to load sasahyou: input file not specified\n"); return 1; } uint16_t signature[4]; @@ -68,7 +68,7 @@ int sasahyou_load(Sasahyou *sasahyou) { int sasahyou_save(Sasahyou *sasahyou) { if (sasahyou->file == NULL) { - fprintf(stderr, "Failed to save sasahyou: file not specified\n"); + fprintf(stderr, "Failed to save sasahyou: output file not specified\n"); return 1; } rewind(sasahyou->file); @@ -95,7 +95,7 @@ int sasahyou_save(Sasahyou *sasahyou) { int sasahyou_open(Sasahyou *sasahyou, const char *path) { sasahyou->file = fopen(path, "r+b"); if (sasahyou->file == NULL) { - fprintf(stderr, "Failed to dump sasahyou: failed to open file\n"); + fprintf(stderr, "Failed to open sasahyou: failed to open file '%s'\n", path); return 1; } return sasahyou_load(sasahyou); @@ -104,7 +104,7 @@ int sasahyou_open(Sasahyou *sasahyou, const char *path) { int sasahyou_dump(Sasahyou *sasahyou, const char *path) { sasahyou->file = fopen(path, "w+b"); if (sasahyou->file == NULL) { - fprintf(stderr, "Failed to dump sasahyou: failed to open file\n"); + fprintf(stderr, "Failed to dump sasahyou: failed to write to file '%s'\n", path); return 1; } return sasahyou_save(sasahyou); @@ -147,8 +147,7 @@ int sasa_rem(Sasahyou *sasahyou, uint64_t sasa_id) { return 1; } if (sasahyou->database[sasa_id].id == HOLE_ID) { - fprintf(stderr, "Failed to remove sasa: target sasa is already removed\n"); - return 1; + return 0; } sasahyou->database[sasa_id].id = HOLE_ID; sasahyou->hole_cnt++; diff --git a/src/core/shoppyou.c b/src/core/shoppyou.c index 035f635..b526cf0 100644 --- a/src/core/shoppyou.c +++ b/src/core/shoppyou.c @@ -31,7 +31,7 @@ int shoppyou_free(Shoppyou *shoppyou) { int shoppyou_load(Shoppyou *shoppyou) { if (shoppyou->file == NULL) { - fprintf(stderr, "Failed to load shoppyou: file not specified\n"); + fprintf(stderr, "Failed to load shoppyou: input file not specified\n"); return 1; } uint16_t signature[4]; @@ -57,7 +57,7 @@ int shoppyou_load(Shoppyou *shoppyou) { int shoppyou_save(Shoppyou *shoppyou) { if (shoppyou->file == NULL) { - fprintf(stderr, "Failed to save shoppyou: file not specified\n"); + fprintf(stderr, "Failed to save shoppyou: output file not specified\n"); return 1; } rewind(shoppyou->file); @@ -81,7 +81,7 @@ int shoppyou_save(Shoppyou *shoppyou) { int shoppyou_open(Shoppyou *shoppyou, const char *path) { shoppyou->file = fopen(path, "r+b"); if (shoppyou->file == NULL) { - fprintf(stderr, "Failed to dump shoppyou: failed to open file '%s'\n", path); + fprintf(stderr, "Failed to open shoppyou: failed to open file '%s'\n", path); return 1; } shoppyou->holes = NULL; @@ -91,7 +91,7 @@ int shoppyou_open(Shoppyou *shoppyou, const char *path) { int shoppyou_dump(Shoppyou *shoppyou, const char *path) { shoppyou->file = fopen(path, "w+b"); if (shoppyou->file == NULL) { - fprintf(stderr, "Failed to dump shoppyou: failed to open file '%s'\n", path); + fprintf(stderr, "Failed to dump shoppyou: failed to write to file '%s'\n", path); return 1; } return shoppyou_save(shoppyou); @@ -138,6 +138,5 @@ int kazari_rem(Shoppyou *shoppyou, uint64_t sasa_id, uint64_t tanzaku_id) { return 0; } } - fprintf(stderr, "Failed to remove kazari: target kazari does not exist or is already removed\n"); - return 1; + return 0; }