From: David Tardon <dtardon@redhat.com>
Date: Fri, 21 Apr 2023 08:44:26 +0000 (+0200)
Subject: logind-core: modernize button_free()
X-Git-Tag: v254-rc1~603^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737e0f12d926a9aeb1ce5df14ae6bdd12d7eaa35;p=thirdparty%2Fsystemd.git

logind-core: modernize button_free()
---

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 727dad0b160..7f95fa7a4f7 100644
--- 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 041d66521ce..6c39471fb44 100644
--- 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);