From 49b667272b3c5e714692bb31a8e276031ac9a941 Mon Sep 17 00:00:00 2001 From: Connor E <38229097+c-edw@users.noreply.github.com> Date: Fri, 1 Feb 2019 11:51:03 +0000 Subject: [PATCH] Revert "Add some missing frees." This reverts commit b5d95f264d5b08f6228e05be680ee36fc06ca6d6. --- sway/config/output.c | 1 - sway/criteria.c | 7 +++---- swaybar/config.c | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sway/config/output.c b/sway/config/output.c index cc5f29db4..970764b03 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -402,6 +402,5 @@ void free_output_config(struct output_config *oc) { free(oc->name); free(oc->background); free(oc->background_option); - free(oc->background_fallback); free(oc); } diff --git a/sway/criteria.c b/sway/criteria.c index 59a923f93..48ef39df4 100644 --- a/sway/criteria.c +++ b/sway/criteria.c @@ -35,19 +35,18 @@ bool criteria_is_empty(struct criteria *criteria) { } void criteria_destroy(struct criteria *criteria) { - free(criteria->raw); - free(criteria->cmdlist); - free(criteria->target); pcre_free(criteria->title); pcre_free(criteria->shell); pcre_free(criteria->app_id); - pcre_free(criteria->con_mark); #if HAVE_XWAYLAND pcre_free(criteria->class); pcre_free(criteria->instance); pcre_free(criteria->window_role); #endif + pcre_free(criteria->con_mark); free(criteria->workspace); + free(criteria->cmdlist); + free(criteria->raw); free(criteria); } diff --git a/swaybar/config.c b/swaybar/config.c index b94fcfee8..6e36573cf 100644 --- a/swaybar/config.c +++ b/swaybar/config.c @@ -108,7 +108,6 @@ void free_config(struct swaybar_config *config) { free(config->mode); free(config->hidden_state); free(config->sep_symbol); - free(config->modifier); for (int i = 0; i < config->bindings->length; i++) { struct swaybar_binding *binding = config->bindings->items[i]; free_binding(binding);