From 44e7b9492617408130d11ffa451c2660942974f6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 Aug 2014 22:44:51 +0200 Subject: networkd: monopolize in_addr utility functions in shared/in-addr-util.h Primarily, this means we get rid of net_parse_inaddr(), and replace it everywhere with in_addr_from_string() and in_addr_from_string_auto(). These functions do not clobber the callers arguments on failure, which is more close to our usual coding style. --- src/libsystemd-network/network-internal.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/libsystemd-network/network-internal.h') diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index 6dd518bb48..49387d03cf 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -1,5 +1,7 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +#pragma once + /*** This file is part of systemd. @@ -19,8 +21,6 @@ along with systemd; If not, see . ***/ -#pragma once - #include #include #include @@ -44,8 +44,6 @@ bool net_match_config(const struct ether_addr *match_mac, const char *dev_type, const char *dev_name); -unsigned net_netmask_to_prefixlen(const struct in_addr *netmask); - int config_parse_net_condition(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); @@ -62,8 +60,6 @@ int config_parse_ifalias(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -int net_parse_inaddr(const char *address, int *family, void *dst); - int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]); const char *net_get_name(struct udev_device *device); -- cgit v1.2.3-54-g00ecf