From: David Tardon <dtardon@redhat.com>
Date: Fri, 21 Apr 2023 13:50:21 +0000 (+0200)
Subject: logind-session-device: modernize session_device_free()
X-Git-Tag: v254-rc1~603^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80e52052dbb42ed15ea74dc3b880bf51917e8f43;p=thirdparty%2Fsystemd.git

logind-session-device: modernize session_device_free()
---

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index a8b3b489922..9743cd570cf 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -375,8 +375,9 @@ error:
         return r;
 }
 
-void session_device_free(SessionDevice *sd) {
-        assert(sd);
+SessionDevice *session_device_free(SessionDevice *sd) {
+        if (!sd)
+                return NULL;
 
         /* Make sure to remove the pushed fd. */
         if (sd->pushed_fd)
@@ -391,7 +392,8 @@ void session_device_free(SessionDevice *sd) {
         hashmap_remove(sd->session->devices, &sd->dev);
 
         free(sd->node);
-        free(sd);
+
+        return mfree(sd);
 }
 
 void session_device_complete_pause(SessionDevice *sd) {
diff --git a/src/login/logind-session-device.h b/src/login/logind-session-device.h
index 4da3fe65338..a606d84f0ef 100644
--- a/src/login/logind-session-device.h
+++ b/src/login/logind-session-device.h
@@ -28,7 +28,7 @@ struct SessionDevice {
 };
 
 int session_device_new(Session *s, dev_t dev, bool open_device, SessionDevice **out);
-void session_device_free(SessionDevice *sd);
+SessionDevice *session_device_free(SessionDevice *sd);
 void session_device_complete_pause(SessionDevice *sd);
 
 void session_device_resume_all(Session *s);