From 99db7aa7cfe55c2485c31e9f0fefd459fc1c09f2 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 12 Apr 2022 13:01:56 +0200 Subject: config: config_free(): pass conf struct by pointer, not by-value --- config.c | 62 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index 3def58b5..c9f2d69b 100644 --- a/config.c +++ b/config.c @@ -3172,8 +3172,8 @@ UNITTEST xassert(clone != NULL); xassert(clone != &original); - config_free(original); - config_free(*clone); + config_free(&original); + config_free(clone); free(clone); tll_free(overrides); @@ -3181,35 +3181,35 @@ UNITTEST } void -config_free(struct config conf) -{ - free(conf.term); - free(conf.shell); - free(conf.title); - free(conf.app_id); - free(conf.word_delimiters); - spawn_template_free(&conf.bell.command); - free(conf.scrollback.indicator.text); - spawn_template_free(&conf.notify); - for (size_t i = 0; i < ALEN(conf.fonts); i++) - config_font_list_destroy(&conf.fonts[i]); - free(conf.server_socket_path); - - config_font_list_destroy(&conf.csd.font); - - free(conf.url.label_letters); - spawn_template_free(&conf.url.launch); - for (size_t i = 0; i < conf.url.prot_count; i++) - free(conf.url.protocols[i]); - free(conf.url.protocols); - free(conf.url.uri_characters); - - free_key_binding_list(&conf.bindings.key); - free_key_binding_list(&conf.bindings.search); - free_key_binding_list(&conf.bindings.url); - free_key_binding_list(&conf.bindings.mouse); - - user_notifications_free(&conf.notifications); +config_free(struct config *conf) +{ + free(conf->term); + free(conf->shell); + free(conf->title); + free(conf->app_id); + free(conf->word_delimiters); + spawn_template_free(&conf->bell.command); + free(conf->scrollback.indicator.text); + spawn_template_free(&conf->notify); + for (size_t i = 0; i < ALEN(conf->fonts); i++) + config_font_list_destroy(&conf->fonts[i]); + free(conf->server_socket_path); + + config_font_list_destroy(&conf->csd.font); + + free(conf->url.label_letters); + spawn_template_free(&conf->url.launch); + for (size_t i = 0; i < conf->url.prot_count; i++) + free(conf->url.protocols[i]); + free(conf->url.protocols); + free(conf->url.uri_characters); + + free_key_binding_list(&conf->bindings.key); + free_key_binding_list(&conf->bindings.search); + free_key_binding_list(&conf->bindings.url); + free_key_binding_list(&conf->bindings.mouse); + + user_notifications_free(&conf->notifications); } bool -- cgit v1.3