From 998b22a288d3808711c76b81c423950bb05d05fb Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Sat, 18 Apr 2026 17:38:27 +0800 Subject: [PATCH] config/runtime_config: remove goto in runtime_config_load function --- src/config/runtime_config.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/config/runtime_config.c b/src/config/runtime_config.c index c70d883..60dfbff 100644 --- a/src/config/runtime_config.c +++ b/src/config/runtime_config.c @@ -195,18 +195,19 @@ bool runtime_config_load(const char *override_path, runtime_init_desc_t *out) { runtime_config_cleanup(out); config_loader_t loader = {0}; - bool ok = false; - if (!config_loader_load(&loader, override_path)) goto cleanup; + if (!config_loader_load(&loader, override_path)) { + config_loader_cleanup(&loader); + return false; + } zdwm_config_setup_fn *setup = 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) { out->config_module_handle = loader.handle; loader.handle = nullptr; } -cleanup: config_loader_cleanup(&loader); return ok; }