From 7c8ac12b55136b2064f8ab8db7bb93ac088088fb Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sun, 31 Jul 2022 19:25:18 -0400 Subject: [PATCH] decomp: fix calls to `read_config_file` (#1717) --- decompiler/config.h | 3 ++- decompiler/extractor/main.cpp | 3 +-- test/offline/offline_test_main.cpp | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/decompiler/config.h b/decompiler/config.h index ee04404289..cb43d9192a 100644 --- a/decompiler/config.h +++ b/decompiler/config.h @@ -166,6 +166,7 @@ struct Config { std::unordered_map> import_deps_by_file; }; -Config read_config_file(const fs::path& path_to_config_file, const std::string& override_json); +Config read_config_file(const fs::path& path_to_config_file, + const std::string& override_json = "{}"); } // namespace decompiler diff --git a/decompiler/extractor/main.cpp b/decompiler/extractor/main.cpp index 3f7e1b34b0..06e6212a85 100644 --- a/decompiler/extractor/main.cpp +++ b/decompiler/extractor/main.cpp @@ -106,8 +106,7 @@ void decompile(const fs::path& iso_data_path, const std::string& data_subfolder) Config config = read_config_file((file_util::get_jak_project_dir() / "decompiler" / "config" / fmt::format("{}.jsonc", version_info.decomp_config)) - .string(), - {}); + .string()); std::vector dgos, objs; diff --git a/test/offline/offline_test_main.cpp b/test/offline/offline_test_main.cpp index 5a4e1bcf0d..4147d8a9f0 100644 --- a/test/offline/offline_test_main.cpp +++ b/test/offline/offline_test_main.cpp @@ -63,8 +63,7 @@ Decompiler setup_decompiler(const std::vector& files, decompiler::init_opcode_info(); dc.config = std::make_unique(decompiler::read_config_file( (file_util::get_jak_project_dir() / "decompiler" / "config" / game_name_to_config[game_name]) - .string(), - {})); + .string())); // modify the config std::unordered_set object_files;