chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-network: rename the per-ifindex calls to sd_network_get_link_xxx()
[elogind.git]
/
src
/
network
/
sd-network.c
diff --git
a/src/network/sd-network.c
b/src/network/sd-network.c
index 260ca470d1142cf08df5e73da069910bbcc6ed02..cc4b160e74e3598583d02c9ba5e66604364bda0a 100644
(file)
--- a/
src/network/sd-network.c
+++ b/
src/network/sd-network.c
@@
-107,7
+107,7
@@
_public_ int sd_network_get_link_operational_state(int ifindex, char **state) {
return 0;
}
return 0;
}
-_public_ int sd_network_get_llmnr(int ifindex, char **llmnr) {
+_public_ int sd_network_get_l
ink_l
lmnr(int ifindex, char **llmnr) {
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
_cleanup_free_ char *s = NULL, *p = NULL;
int r;
@@
-122,6
+122,8
@@
_public_ int sd_network_get_llmnr(int ifindex, char **llmnr) {
return -ENODATA;
else if (r < 0)
return r;
return -ENODATA;
else if (r < 0)
return r;
+ else if (!s)
+ return -ENODATA;
*llmnr = s;
s = NULL;
*llmnr = s;
s = NULL;
@@
-129,7
+131,7
@@
_public_ int sd_network_get_llmnr(int ifindex, char **llmnr) {
return 0;
}
return 0;
}
-_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
+_public_ int sd_network_get_
link_
dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
_cleanup_free_ char *p = NULL, *s = NULL;
sd_dhcp_lease *lease = NULL;
int r;
_cleanup_free_ char *p = NULL, *s = NULL;
sd_dhcp_lease *lease = NULL;
int r;
@@
-156,7
+158,7
@@
_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
return 0;
}
return 0;
}
-static int network_get_strv(const char *key, int ifindex, char ***ret) {
+static int network_get_
link_
strv(const char *key, int ifindex, char ***ret) {
_cleanup_free_ char *p = NULL, *s = NULL;
_cleanup_strv_free_ char **a = NULL;
int r;
_cleanup_free_ char *p = NULL, *s = NULL;
_cleanup_strv_free_ char **a = NULL;
int r;
@@
-189,12
+191,12
@@
static int network_get_strv(const char *key, int ifindex, char ***ret) {
return r;
}
return r;
}
-_public_ int sd_network_get_dns(int ifindex, char ***ret) {
- return network_get_strv("DNS", ifindex, ret);
+_public_ int sd_network_get_
link_
dns(int ifindex, char ***ret) {
+ return network_get_
link_
strv("DNS", ifindex, ret);
}
}
-_public_ int sd_network_get_ntp(int ifindex, char ***ret) {
- return network_get_strv("NTP", ifindex, ret);
+_public_ int sd_network_get_
link_
ntp(int ifindex, char ***ret) {
+ return network_get_
link_
strv("NTP", ifindex, ret);
}
static inline int MONITOR_TO_FD(sd_network_monitor *m) {
}
static inline int MONITOR_TO_FD(sd_network_monitor *m) {