logind-session-device: modernize session_device_free()

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index a8b3b48992216fb6b7de4201274a8af4599e9c55..9743cd570cf820850406427459c4ea0598aa59ca 100644 (file)
--- 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 4da3fe6533838cec8b648f4cac4f66623cee5e87..a606d84f0efb27f2fa5e87d0046625721485582a 100644 (file)
--- 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);