diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-12 14:04:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-14 17:01:54 +0100 |
| commit | aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6 (patch) | |
| tree | ea8b676c0cfc8d35dd9977d16a6fcf214704200d /src/network/networkd-lldp-tx.c | |
| parent | 01771226c202183ff447da712f43d2fad8874484 (diff) | |
| download | systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.tar.gz | |
fileio: drop "newline" parameter for env file parsers
Now that we don't (mis-)use the env file parser to parse kernel command
lines there's no need anymore to override the used newline character
set. Let's hence drop the argument and just "\n\r" always. This nicely
simplifies our code.
Diffstat (limited to 'src/network/networkd-lldp-tx.c')
| -rw-r--r-- | src/network/networkd-lldp-tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c index 51fadc8125..fa36e94a7c 100644 --- a/src/network/networkd-lldp-tx.c +++ b/src/network/networkd-lldp-tx.c @@ -244,7 +244,7 @@ static int link_send_lldp(Link *link) { return r; (void) gethostname_strict(&hostname); - (void) parse_env_file(NULL, "/etc/machine-info", NEWLINE, "PRETTY_HOSTNAME", &pretty_hostname, NULL); + (void) parse_env_file(NULL, "/etc/machine-info", "PRETTY_HOSTNAME", &pretty_hostname, NULL); assert_cc(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1 <= (UINT16_MAX - 1) * USEC_PER_SEC); ttl = DIV_ROUND_UP(LLDP_TX_INTERVAL_USEC * LLDP_TX_HOLD + 1, USEC_PER_SEC); |