From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 27 Nov 2017 12:08:37 +0000 (+0000)
Subject: networkd: fix reversed arguments
X-Git-Tag: v236~102^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbd1590085a2042c3dd452085babe33e1cfda04f;p=thirdparty%2Fsystemd.git

networkd: fix reversed arguments

Found by coverity.

Also drop unused return value while at it.
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 852d690ef58..ad3c442c8e7 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -471,7 +471,7 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, vo
                                 return 0;
                 }
 
-                route_update(route, &src, src_prefixlen, &gw, &prefsrc, scope, rt_type, protocol);
+                route_update(route, &src, src_prefixlen, &gw, &prefsrc, scope, protocol, rt_type);
 
                 break;
 
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 6139ad3669e..b0ad707811b 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -368,7 +368,7 @@ int route_add(
         return 0;
 }
 
-int route_update(Route *route,
+void route_update(Route *route,
                  const union in_addr_union *src,
                  unsigned char src_prefixlen,
                  const union in_addr_union *gw,
@@ -389,8 +389,6 @@ int route_update(Route *route,
         route->scope = scope;
         route->protocol = protocol;
         route->type = type;
-
-        return 0;
 }
 
 int route_remove(Route *route, Link *link,
diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index ff03a39c0f3..cfb85cbd6d3 100644
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -64,7 +64,7 @@ int route_remove(Route *route, Link *link, sd_netlink_message_handler_t callback
 int route_get(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, uint32_t table, Route **ret);
 int route_add(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, uint32_t table, Route **ret);
 int route_add_foreign(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, uint32_t table, Route **ret);
-int route_update(Route *route, const union in_addr_union *src, unsigned char src_prefixlen, const union in_addr_union *gw, const union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol, unsigned char type);
+void route_update(Route *route, const union in_addr_union *src, unsigned char src_prefixlen, const union in_addr_union *gw, const union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol, unsigned char type);
 
 int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata);