sd-network: fix parameter order for sd_network_monitor_new()

Constructors should return the object they created as first parameter,
except when they are generated as a child/member object of some other
object in which case that should be first.

diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index c6038c63bfaa77d534e86de38a83d3de7ca354ed..c4783ca2e9e6f44f636947e478be0d58c31df640 100644 (file)
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -252,7 +252,7 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        r = sd_network_monitor_new(NULL, &m->monitor);
+        r = sd_network_monitor_new(&m->monitor, NULL);
         if (r < 0) {
                 log_error("Could not create monitor: %s", strerror(-r));
                 goto out;

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 3ebc5d8b13d73d7aa0b3206cd5e41e49205847fb..2057e537740a2eea9ff30f0fda2badd8c9401e0a 100644 (file)
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -316,7 +316,7 @@ static inline sd_network_monitor* FD_TO_MONITOR(int fd) {
         return (sd_network_monitor*) (unsigned long) (fd + 1);
 }
 
-_public_ int sd_network_monitor_new(const char *category, sd_network_monitor **m) {
+_public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category) {
         int fd, k;
         bool good = false;
 

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index ab504d0a758f73033255b106a22f4dbb4103a54c..5fbb500fd0530dd57c2ab73a79c9d15b02a0cf0e 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -282,7 +282,7 @@ static int manager_network_monitor_listen(Manager *m) {
 
         assert(m);
 
-        r = sd_network_monitor_new(NULL, &m->network_monitor);
+        r = sd_network_monitor_new(&m->network_monitor, NULL);
         if (r < 0)
                 return r;
 

diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index 7d05086be65d0ee6253ab9f31893b8b7fdc992b0..0eaefdc7b181b35967c88ae8e3dbd65ff4404c04 100644 (file)
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -106,7 +106,7 @@ int sd_network_get_ifindices(unsigned **indices);
 typedef struct sd_network_monitor sd_network_monitor;
 
 /* Create a new monitor. Category must be NULL, "links" or "leases". */
-int sd_network_monitor_new(const char *category, sd_network_monitor **ret);
+int sd_network_monitor_new(sd_network_monitor **ret, const char *category);
 
 /* Destroys the passed monitor. Returns NULL. */
 sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m);

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index e4e3aaecdfbc1128cf7f450b7b56bbce664a76f9..732f5bf6c2843e4724063e819fc6afd76fe62f2f 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -1152,7 +1152,7 @@ static int manager_network_monitor_listen(Manager *m) {
         _cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL;
         int r, fd, events;
 
-        r = sd_network_monitor_new(NULL, &monitor);
+        r = sd_network_monitor_new(&monitor, NULL);
         if (r < 0)
                 return r;