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

fix(lib): load database anyway

Browse Source
This commit is contained in:
Masahiko AMANO 2023-01-31 16:46:24 +03:00
parent 4b7766695e
commit 9a2fa14a79
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tanabata/lib/database.c
View File

@ -124,9 +124,9 @@ int tanabata_weed(Tanabata *tanabata) {
} }
int tanabata_load(Tanabata *tanabata) { int tanabata_load(Tanabata *tanabata) {
if (tanabata->sasahyou_mod != tanabata->sasahyou.modified_ts && sasahyou_load(&tanabata->sasahyou) != 0 || if (sasahyou_load(&tanabata->sasahyou) != 0 ||
tanabata->sappyou_mod != tanabata->sappyou.modified_ts && sappyou_load(&tanabata->sappyou) != 0 || sappyou_load(&tanabata->sappyou) != 0 ||
tanabata->shoppyou_mod != tanabata->shoppyou.modified_ts && shoppyou_load(&tanabata->shoppyou) != 0) { shoppyou_load(&tanabata->shoppyou) != 0) {
return 1; return 1;
} }
tanabata->sasahyou_mod = tanabata->sasahyou.modified_ts; tanabata->sasahyou_mod = tanabata->sasahyou.modified_ts;
@ -158,11 +158,8 @@ int tanabata_open(Tanabata *tanabata, const char *path) {
size_t pathlen = strlen(path); size_t pathlen = strlen(path);
char *file_path = malloc(pathlen + 10); char *file_path = malloc(pathlen + 10);
strcpy(file_path, path); strcpy(file_path, path);
if (tanabata->sasahyou_mod != tanabata->sasahyou.modified_ts && if (sasahyou_open(&tanabata->sasahyou, strcpy(file_path + pathlen, "/sasahyou") - pathlen) != 0 ||
sasahyou_open(&tanabata->sasahyou, strcpy(file_path + pathlen, "/sasahyou") - pathlen) != 0 ||
tanabata->sappyou_mod != tanabata->sappyou.modified_ts &&
sappyou_open(&tanabata->sappyou, strcpy(file_path + pathlen, "/sappyou") - pathlen) != 0 || sappyou_open(&tanabata->sappyou, strcpy(file_path + pathlen, "/sappyou") - pathlen) != 0 ||
tanabata->shoppyou_mod != tanabata->shoppyou.modified_ts &&
shoppyou_open(&tanabata->shoppyou, strcpy(file_path + pathlen, "/shoppyou") - pathlen) != 0) { shoppyou_open(&tanabata->shoppyou, strcpy(file_path + pathlen, "/shoppyou") - pathlen) != 0) {
free(file_path); free(file_path);
return 1; return 1;