diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-12 11:42:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 11:42:02 +0100 |
| commit | 192602cb1e371e691e270cbe911b587b39e8d2c6 (patch) | |
| tree | 4cfca6fbbb39d6fe4f6530edbf0bbea50d63e44f /src/udev | |
| parent | 8cc9fefe2e3e0b0d2c235e8b26abc82c4106c5f6 (diff) | |
| parent | 538f15cf06de4d6dfc12f8ffacdba9f1af6d3e15 (diff) | |
| download | systemd-192602cb1e371e691e270cbe911b587b39e8d2c6.tar.gz systemd-192602cb1e371e691e270cbe911b587b39e8d2c6.tar.bz2 systemd-192602cb1e371e691e270cbe911b587b39e8d2c6.zip | |
Merge pull request #10734 from yuwata/network-use-structured-initializers
network: several cleanups
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/net/ethtool-util.h | 11 | ||||
| -rw-r--r-- | src/udev/net/link-config.h | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h index abb0cd0264..73c4d447d1 100644 --- a/src/udev/net/ethtool-util.h +++ b/src/udev/net/ethtool-util.h @@ -4,6 +4,7 @@ #include <macro.h> #include <linux/ethtool.h> +#include "conf-parser.h" #include "missing.h" struct link_config; @@ -119,8 +120,8 @@ NetDevPort port_from_string(const char *port) _pure_; const char *advertise_to_string(NetDevAdvertise advertise) _const_; NetDevAdvertise advertise_from_string(const char *advertise) _pure_; -int config_parse_duplex(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 config_parse_wol(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 config_parse_port(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 config_parse_channel(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 config_parse_advertise(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); +CONFIG_PARSER_PROTOTYPE(config_parse_duplex); +CONFIG_PARSER_PROTOTYPE(config_parse_wol); +CONFIG_PARSER_PROTOTYPE(config_parse_port); +CONFIG_PARSER_PROTOTYPE(config_parse_channel); +CONFIG_PARSER_PROTOTYPE(config_parse_advertise); diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h index ca6c8ddabe..88e3651b7b 100644 --- a/src/udev/net/link-config.h +++ b/src/udev/net/link-config.h @@ -4,6 +4,7 @@ #include "sd-device.h" #include "condition.h" +#include "conf-parser.h" #include "ethtool-util.h" #include "list.h" #include "set.h" @@ -82,5 +83,5 @@ MACPolicy mac_policy_from_string(const char *p) _pure_; /* gperf lookup function */ const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length); -int config_parse_mac_policy(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 config_parse_name_policy(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); +CONFIG_PARSER_PROTOTYPE(config_parse_mac_policy); +CONFIG_PARSER_PROTOTYPE(config_parse_name_policy); |