diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-03 07:15:44 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-03 07:15:44 +0100 |
| commit | a31afe1a18cca840046d976a637c7918ec6f5fe2 (patch) | |
| tree | 11fd3c0d57bcae37069117036904fe3a8c7f7209 /src/network | |
| parent | 3342582deb95b6e364541435654eb8f6fa320f40 (diff) | |
| parent | 2c1a55cf3fe78bcf728f73487813ddd3ee020a98 (diff) | |
Merge pull request #1758 from poettering/varietygalore
A grab bag of stuff
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkctl.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-link-bus.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 97c1fe6560..ba7e3ba74a 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -521,7 +521,7 @@ static int link_status_one( assert(rtnl); assert(name); - if (safe_atoi(name, &ifindex) >= 0 && ifindex > 0) + if (parse_ifindex(name, &ifindex) >= 0) r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, ifindex); else { r = sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0); diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c index 7fc4510ac9..11b35d6cf8 100644 --- a/src/network/networkd-link-bus.c +++ b/src/network/networkd-link-bus.c @@ -103,7 +103,7 @@ int link_object_find(sd_bus *bus, const char *path, const char *interface, void if (r < 0) return 0; - r = safe_atoi(identifier, &ifindex); + r = parse_ifindex(identifier, &ifindex); if (r < 0) return 0; |