From 8e8375e7af5af21d1741dce1fc5ebc39a2aa270b Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Sat, 29 May 2010 22:20:24 -0700 Subject: [PATCH] Get rid of boilerplate code in swb_config_free() We can loop over swb_config_options[] instead of identifying every string config option explicitly here. --- config.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/config.c b/config.c index 289374b..8928a3d 100644 --- a/config.c +++ b/config.c @@ -73,22 +73,24 @@ void swb_config_init(struct swb_config *cfg) { /* Free all heap memory used in an swb_config struct This MUST NOT be done if any of the strings are being used elsewhere! */ void swb_config_free(struct swb_config *cfg) { + int i; + if (!cfg) return; if (!(cfg->flags & SWB_CONFIG_INITIALIZED)) return; - if (cfg->flags & SWB_CONFIG_DEFAULT_BROWSER_SET) { - free(cfg->default_browser); - cfg->default_browser = NULL; - } - if (cfg->flags & SWB_CONFIG_OTHER_BROWSER_CMD_SET) { - free(cfg->other_browser_cmd); - cfg->other_browser_cmd = NULL; - } - if (cfg->flags & SWB_CONFIG_LOGGING_SET) { - free(cfg->logging); - cfg->logging = NULL; + for (i = 0; swb_config_options[i].name; ++i) { + if (cfg->flags & swb_config_options[i].set_mask) { + switch (swb_config_options[i].type) { + case SWB_CONFIG_OPT_STRING: + free(*(char **)cfg->entries[i]); + *(char **)cfg->entries[i] = NULL; + break; + default: + break; + } + } } cfg->flags = 0; -- 1.7.9.5