From 0014a4ad505d119c7ac4346d9d774c3f17f663a5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 17 Jul 2014 01:07:17 +0200 Subject: 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. --- src/network/networkd-wait-online.c | 2 +- src/network/sd-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network') 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; -- cgit v1.2.3-54-g00ecf