aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Connor E <38229097+c-edw@users.noreply.github.com>2019-02-01 11:51:03 +0000
committerLibravatar Connor E <38229097+c-edw@users.noreply.github.com>2019-02-01 11:51:03 +0000
commit49b667272b3c5e714692bb31a8e276031ac9a941 (patch)
tree948eee5881f1d1ce8bad50d64b7647c2640d819e
parentMerge pull request #3543 from emersion/relative-pointer-usec (diff)
downloadsway-49b667272b3c5e714692bb31a8e276031ac9a941.tar.gz
sway-49b667272b3c5e714692bb31a8e276031ac9a941.tar.zst
sway-49b667272b3c5e714692bb31a8e276031ac9a941.zip
Revert "Add some missing frees."
-rw-r--r--sway/config/output.c1
-rw-r--r--sway/criteria.c7
-rw-r--r--swaybar/config.c1
3 files changed, 3 insertions, 6 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index cc5f29db..970764b0 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -402,6 +402,5 @@ void free_output_config(struct output_config *oc) {
402 free(oc->name); 402 free(oc->name);
403 free(oc->background); 403 free(oc->background);
404 free(oc->background_option); 404 free(oc->background_option);
405 free(oc->background_fallback);
406 free(oc); 405 free(oc);
407} 406}
diff --git a/sway/criteria.c b/sway/criteria.c
index 59a923f9..48ef39df 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -35,19 +35,18 @@ bool criteria_is_empty(struct criteria *criteria) {
35} 35}
36 36
37void criteria_destroy(struct criteria *criteria) { 37void criteria_destroy(struct criteria *criteria) {
38 free(criteria->raw);
39 free(criteria->cmdlist);
40 free(criteria->target);
41 pcre_free(criteria->title); 38 pcre_free(criteria->title);
42 pcre_free(criteria->shell); 39 pcre_free(criteria->shell);
43 pcre_free(criteria->app_id); 40 pcre_free(criteria->app_id);
44 pcre_free(criteria->con_mark);
45#if HAVE_XWAYLAND 41#if HAVE_XWAYLAND
46 pcre_free(criteria->class); 42 pcre_free(criteria->class);
47 pcre_free(criteria->instance); 43 pcre_free(criteria->instance);
48 pcre_free(criteria->window_role); 44 pcre_free(criteria->window_role);
49#endif 45#endif
46 pcre_free(criteria->con_mark);
50 free(criteria->workspace); 47 free(criteria->workspace);
48 free(criteria->cmdlist);
49 free(criteria->raw);
51 free(criteria); 50 free(criteria);
52} 51}
53 52
diff --git a/swaybar/config.c b/swaybar/config.c
index b94fcfee..6e36573c 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -108,7 +108,6 @@ void free_config(struct swaybar_config *config) {
108 free(config->mode); 108 free(config->mode);
109 free(config->hidden_state); 109 free(config->hidden_state);
110 free(config->sep_symbol); 110 free(config->sep_symbol);
111 free(config->modifier);
112 for (int i = 0; i < config->bindings->length; i++) { 111 for (int i = 0; i < config->bindings->length; i++) {
113 struct swaybar_binding *binding = config->bindings->items[i]; 112 struct swaybar_binding *binding = config->bindings->items[i];
114 free_binding(binding); 113 free_binding(binding);