summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-17 01:07:17 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-17 01:41:52 +0200
commit0014a4ad505d119c7ac4346d9d774c3f17f663a5 (patch)
tree78670c7fa0bb772e1e334c6f520478067b9c5531 /src
parent260b6323cc2aebe722d5b8e43fa63a502f906774 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/network/networkd-wait-online.c2
-rw-r--r--src/network/sd-network.c2
-rw-r--r--src/resolve/resolved-manager.c2
-rw-r--r--src/systemd/sd-network.h2
-rw-r--r--src/timesync/timesyncd.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index c6038c63bf..c4783ca2e9 100644
--- 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 3ebc5d8b13..2057e53774 100644
--- 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 ab504d0a75..5fbb500fd0 100644
--- 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 7d05086be6..0eaefdc7b1 100644
--- 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 e4e3aaecdf..732f5bf6c2 100644
--- 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;