From 2454cee32e06f395ca091e51ab724f30e9cb278b Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 2 Mar 2024 23:43:39 +0800
Subject: [PATCH] logind: place 'ret' param at last

---
 src/login/logind-core.c    | 6 +++---
 src/login/logind-seat.c    | 4 ++--
 src/login/logind-seat.h    | 4 ++--
 src/login/logind-session.c | 4 ++--
 src/login/logind-session.h | 4 ++--
 src/login/logind-user.c    | 7 ++-----
 src/login/logind-user.h    | 4 ++--
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 582cbcbea84..40d09cd5329 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -118,7 +118,7 @@ int manager_add_seat(Manager *m, const char *id, Seat **ret_seat) {
 
         s = hashmap_get(m->seats, id);
         if (!s) {
-                r = seat_new(&s, m, id);
+                r = seat_new(m, id, &s);
                 if (r < 0)
                         return r;
         }
@@ -138,7 +138,7 @@ int manager_add_session(Manager *m, const char *id, Session **ret_session) {
 
         s = hashmap_get(m->sessions, id);
         if (!s) {
-                r = session_new(&s, m, id);
+                r = session_new(m, id, &s);
                 if (r < 0)
                         return r;
         }
@@ -162,7 +162,7 @@ int manager_add_user(
 
         u = hashmap_get(m->users, UID_TO_PTR(ur->uid));
         if (!u) {
-                r = user_new(&u, m, ur);
+                r = user_new(m, ur, &u);
                 if (r < 0)
                         return r;
         }
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 8d875d2ea77..21f2c1ddd80 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -25,13 +25,13 @@
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 
-int seat_new(Seat** ret, Manager *m, const char *id) {
+int seat_new(Manager *m, const char *id, Seat **ret) {
         _cleanup_(seat_freep) Seat *s = NULL;
         int r;
 
-        assert(ret);
         assert(m);
         assert(id);
+        assert(ret);
 
         if (!seat_name_is_valid(id))
                 return -EINVAL;
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 2d18e7595ac..76a69e6517b 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -26,10 +26,10 @@ struct Seat {
         LIST_FIELDS(Seat, gc_queue);
 };
 
-int seat_new(Seat **ret, Manager *m, const char *id);
+int seat_new(Manager *m, const char *id, Seat **ret);
 Seat* seat_free(Seat *s);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC(Seat *, seat_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(Seat*, seat_free);
 
 int seat_save(Seat *s);
 int seat_load(Seat *s);
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 787855a7b59..a0dc6265b77 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -46,13 +46,13 @@
 static void session_remove_fifo(Session *s);
 static void session_restore_vt(Session *s);
 
-int session_new(Session **ret, Manager *m, const char *id) {
+int session_new(Manager *m, const char *id, Session **ret) {
         _cleanup_(session_freep) Session *s = NULL;
         int r;
 
-        assert(ret);
         assert(m);
         assert(id);
+        assert(ret);
 
         if (!session_id_valid(id))
                 return -EINVAL;
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index f344fb6a61d..0b84e043fd6 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -164,10 +164,10 @@ struct Session {
         LIST_FIELDS(Session, gc_queue);
 };
 
-int session_new(Session **ret, Manager *m, const char *id);
+int session_new(Manager *m, const char *id, Session **ret);
 Session* session_free(Session *s);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC(Session *, session_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(Session*, session_free);
 
 void session_set_user(Session *s, User *u);
 int session_set_leader_consume(Session *s, PidRef _leader);
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index a14c9b7cfbf..537cc551cc0 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -37,17 +37,14 @@
 #include "unit-name.h"
 #include "user-util.h"
 
-int user_new(User **ret,
-             Manager *m,
-             UserRecord *ur) {
-
+int user_new(Manager *m, UserRecord *ur, User **ret) {
         _cleanup_(user_freep) User *u = NULL;
         char lu[DECIMAL_STR_MAX(uid_t) + 1];
         int r;
 
-        assert(ret);
         assert(m);
         assert(ur);
+        assert(ret);
 
         if (!ur->user_name)
                 return -EINVAL;
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index 723b66d1891..7b10c4fd600 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -65,10 +65,10 @@ struct User {
         LIST_FIELDS(User, gc_queue);
 };
 
-int user_new(User **out, Manager *m, UserRecord *ur);
+int user_new(Manager *m, UserRecord *ur, User **ret);
 User *user_free(User *u);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC(User *, user_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(User*, user_free);
 
 int user_start_service_manager(User *u);
 int user_start(User *u);
-- 
2.47.3