From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Tue, 12 Mar 2024 09:39:08 +0000 (+0100)
Subject: logind: place 'ret' param at last
X-Git-Tag: v256-rc1~554^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26ed3ecfe0c48a9709da608a0e18308ba7c8fa20;p=thirdparty%2Fsystemd.git

logind: place 'ret' param at last

Follow-up to 2454cee32e
---

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 54febdadd74..d20ff3d4d48 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -221,7 +221,7 @@ int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **ret) {
 
         i = hashmap_get(m->inhibitors, id);
         if (!i) {
-                r = inhibitor_new(&i, m, id);
+                r = inhibitor_new(m, id, &i);
                 if (r < 0)
                         return r;
         }
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 7591bce08c3..e2421ef9d2f 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -29,13 +29,13 @@
 
 static void inhibitor_remove_fifo(Inhibitor *i);
 
-int inhibitor_new(Inhibitor **ret, Manager *m, const char* id) {
+int inhibitor_new(Manager *m, const char* id, Inhibitor **ret) {
         _cleanup_(inhibitor_freep) Inhibitor *i = NULL;
         int r;
 
-        assert(ret);
         assert(m);
         assert(id);
+        assert(ret);
 
         i = new(Inhibitor, 1);
         if (!i)
diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h
index c34c2256768..15cbbb6cc77 100644
--- a/src/login/logind-inhibit.h
+++ b/src/login/logind-inhibit.h
@@ -51,7 +51,7 @@ struct Inhibitor {
         int fifo_fd;
 };
 
-int inhibitor_new(Inhibitor **ret, Manager *m, const char* id);
+int inhibitor_new(Manager *m, const char* id, Inhibitor **ret);
 Inhibitor* inhibitor_free(Inhibitor *i);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Inhibitor*, inhibitor_free);