From 4bad85b59334467ac839ed2dd91abb6625bc5b89 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 7 Feb 2021 14:52:04 +0100 Subject: misc: when free:ing tll lists, prefer tll_remove() over tll_free() In many places we have the following pattern: tll_foreach(list, it) free(it->item.thing); tll_free(list); Since all tll functions are macros, and thus inlined, and since tll_free in itself expands to a tll_foreach(), the above pattern expands to more native code than necessary. This is somewhat smaller: tll_foreach(list, it) { free(it->item.thing); tll_remove(list, it); } --- config.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index f7452994..b4518622 100644 --- a/config.c +++ b/config.c @@ -2379,9 +2379,10 @@ config_load(struct config *conf, const char *conf_path, conf->url_launch.raw_cmd = xstrdup("xdg-open ${url}"); tokenize_cmdline(conf->url_launch.raw_cmd, &conf->url_launch.argv); - tll_foreach(*initial_user_notifications, it) + tll_foreach(*initial_user_notifications, it) { tll_push_back(conf->notifications, it->item); - tll_free(*initial_user_notifications); + tll_remove(*initial_user_notifications, it); + } add_default_key_bindings(conf); add_default_search_bindings(conf); @@ -2462,9 +2463,10 @@ config_free(struct config conf) free_spawn_template(&conf.notify); free_spawn_template(&conf.url_launch); for (size_t i = 0; i < ALEN(conf.fonts); i++) { - tll_foreach(conf.fonts[i], it) + tll_foreach(conf.fonts[i], it) { config_font_destroy(&it->item); - tll_free(conf.fonts[i]); + tll_remove(conf.fonts[i], it); + } } free(conf.server_socket_path); -- cgit v1.3