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.
This commit is contained in:
parent
260b6323cc
commit
0014a4ad50
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue