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 54febdadd748843d102bef2ec48865906d852026..d20ff3d4d485c5822091e5759027062fd2cee970 100644 (file)
--- 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 7591bce08c3aef98ff6f4db118af5ee4f4893a49..e2421ef9d2f79e8cad8aa3486ba188c458a543ea 100644 (file)
--- 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 c34c22567680df31b27cd9d4d6b053c192a5e7b8..15cbbb6cc77a2d15261de3027dbc32aedd6e56d8 100644 (file)
--- 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);