zedhugh/zdwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config/runtime_config: remove goto in runtime_config_load function

Browse Source
This commit is contained in:
Zedhugh Chen
2026-04-18 17:38:27 +08:00
parent 2fc4b33359
commit 998b22a288
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/config/runtime_config.c
View File

@@ -195,18 +195,19 @@ bool runtime_config_load(const char *override_path, runtime_init_desc_t *out) {
runtime_config_cleanup(out); runtime_config_cleanup(out);
config_loader_t loader = {0}; config_loader_t loader = {0};
bool ok = false; if (!config_loader_load(&loader, override_path)) {
if (!config_loader_load(&loader, override_path)) goto cleanup; config_loader_cleanup(&loader);
return false;
}
zdwm_config_setup_fn *setup = zdwm_config_setup_fn *setup =
loader.setup ? loader.setup : config_defaults_build; loader.setup ? loader.setup : config_defaults_build;
ok = runtime_config_build(setup, out->outputs, out->output_count, out); bool ok = runtime_config_build(setup, out->outputs, out->output_count, out);
if (ok) { if (ok) {
out->config_module_handle = loader.handle; out->config_module_handle = loader.handle;
loader.handle = nullptr; loader.handle = nullptr;
} }
cleanup:
config_loader_cleanup(&loader); config_loader_cleanup(&loader);
return ok; return ok;
} }