From 240c2c93954008af7b087ef730cf2db92bd77e12 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Thu, 22 Aug 2024 11:02:11 +0900 Subject: [PATCH 1/2] Update rsave_read() parameters to specify read mode --- src/resume.c | 6 +++--- subprojects/libsys4 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resume.c b/src/resume.c index b7dc249..024a4a9 100644 --- a/src/resume.c +++ b/src/resume.c @@ -835,7 +835,7 @@ static enum savefile_error load_rsave_image(const char *key, const char *path) { char *full_path = savedir_path(path); enum savefile_error error; - struct rsave *save = rsave_read(full_path, &error); + struct rsave *save = rsave_read(full_path, RSAVE_READ_ALL, &error); free(full_path); if (error != SAVEFILE_SUCCESS) return error; @@ -904,7 +904,7 @@ static struct page *load_json_image_comments(const char *key, const char *path, static struct page *load_rsave_image_comments(const char *key, const char *path, enum savefile_error *error) { char *full_path = savedir_path(path); - struct rsave *save = rsave_read(full_path, error); + struct rsave *save = rsave_read(full_path, RSAVE_READ_COMMENTS, error); free(full_path); if (*error != SAVEFILE_SUCCESS) return NULL; @@ -951,7 +951,7 @@ static int write_rsave_image_comments(const char *key, const char *path, struct { char *full_path = savedir_path(path); enum savefile_error error; - struct rsave *save = rsave_read(full_path, &error); + struct rsave *save = rsave_read(full_path, RSAVE_READ_ALL, &error); switch (error) { case SAVEFILE_SUCCESS: if (strcmp(key, save->key)) diff --git a/subprojects/libsys4 b/subprojects/libsys4 index 07efd63..81c1319 160000 --- a/subprojects/libsys4 +++ b/subprojects/libsys4 @@ -1 +1 @@ -Subproject commit 07efd63c62a74ecde8145bf0084bc9e9dfa8c476 +Subproject commit 81c13197702309813e61867ef6b3093d7b5565b5 From 00aa0c2ae6aceeb450342d6133bca85089ec42bf Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sun, 25 Aug 2024 08:08:45 +0900 Subject: [PATCH 2/2] Fix build without debugger --- include/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/debugger.h b/include/debugger.h index 78b5408..9c698ee 100644 --- a/include/debugger.h +++ b/include/debugger.h @@ -103,7 +103,7 @@ void dbg_scm_repl(void); #endif /* HAVE_SCHEME */ #else /* DEBUGGER ENABLED */ #define dbg_init() -#define dbg_repl() +#define dbg_repl(type, msg) #define dbg_dap 0 #define dbg_dap_handle_messages() #define dbg_dap_log(log, fmt, ap)