logind-core: modernize button_free()

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 727dad0b16021a51d715028f4cd383ea7c07263c..7f95fa7a4f709e80e2bbfc955afc6db864315375 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -53,8 +53,9 @@ Button* button_new(Manager *m, const char *name) {
         return b;
 }
 
-void button_free(Button *b) {
-        assert(b);
+Button *button_free(Button *b) {
+        if (!b)
+                return NULL;
 
         hashmap_remove(b->manager->buttons, b->name);
 
@@ -65,7 +66,8 @@ void button_free(Button *b) {
 
         free(b->name);
         free(b->seat);
-        free(b);
+
+        return mfree(b);
 }
 
 int button_set_seat(Button *b, const char *sn) {

diff --git a/src/login/logind-button.h b/src/login/logind-button.h
index 041d66521ce51c813992d4e6be069a5de8b9ee3e..6c39471fb44f1cd6294b4538bb0f4d28cb1ad45c 100644 (file)
--- a/src/login/logind-button.h
+++ b/src/login/logind-button.h
@@ -20,7 +20,7 @@ struct Button {
 };
 
 Button* button_new(Manager *m, const char *name);
-void button_free(Button *b);
+Button *button_free(Button *b);
 int button_open(Button *b);
 int button_set_seat(Button *b, const char *sn);
 int button_check_switches(Button *b);