chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused variables
[elogind.git]
/
src
/
libsystemd
/
sd-network
/
sd-network.c
diff --git
a/src/libsystemd/sd-network/sd-network.c
b/src/libsystemd/sd-network/sd-network.c
index e30fc3cbf4240c84976265006412b4e34f88446b..3a3f53576f365cf68f264103bae7baef22b8459e 100644
(file)
--- a/
src/libsystemd/sd-network/sd-network.c
+++ b/
src/libsystemd/sd-network/sd-network.c
@@
-92,6
+92,10
@@
_public_ int sd_network_get_ntp(char ***ret) {
return network_get_strv("NTP", ret);
}
return network_get_strv("NTP", ret);
}
+_public_ int sd_network_get_domains(char ***ret) {
+ return network_get_strv("DOMAINS", ret);
+}
+
_public_ int sd_network_link_get_setup_state(int ifindex, char **state) {
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
_public_ int sd_network_link_get_setup_state(int ifindex, char **state) {
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
@@
-220,11
+224,12
@@
_public_ int sd_network_link_get_wildcard_domain(int ifindex) {
return -ENOMEM;
r = parse_env_file(p, NEWLINE, "WILDCARD_DOMAIN", &s, NULL);
return -ENOMEM;
r = parse_env_file(p, NEWLINE, "WILDCARD_DOMAIN", &s, NULL);
+ if (r == -ENOENT)
+ return -ENODATA;
if (r < 0)
return r;
if (r < 0)
return r;
-
- if (!s)
- return -EIO;
+ if (isempty(s))
+ return -ENODATA;
return parse_boolean(s);
}
return parse_boolean(s);
}