chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include <poll.h> instead of <sys/poll.h>
[elogind.git]
/
src
/
libsystemd
/
sd-login
/
sd-login.c
diff --git
a/src/libsystemd/sd-login/sd-login.c
b/src/libsystemd/sd-login/sd-login.c
index c72d23ed5342f2032a85c438ca7741897262d282..f71749f72d4d136c15a480cf218764986551abf4 100644
(file)
--- a/
src/libsystemd/sd-login/sd-login.c
+++ b/
src/libsystemd/sd-login/sd-login.c
@@
-23,7
+23,7
@@
#include <string.h>
#include <errno.h>
#include <sys/inotify.h>
#include <string.h>
#include <errno.h>
#include <sys/inotify.h>
-#include <
sys/
poll.h>
+#include <poll.h>
#include "util.h"
#include "cgroup-util.h"
#include "util.h"
#include "cgroup-util.h"
@@
-791,7
+791,7
@@
_public_ int sd_machine_get_class(const char *machine, char **class) {
assert_return(machine_name_is_valid(machine), -EINVAL);
assert_return(class, -EINVAL);
assert_return(machine_name_is_valid(machine), -EINVAL);
assert_return(class, -EINVAL);
- p = str
append
a("/run/systemd/machines/", machine);
+ p = str
join
a("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "CLASS", &c, NULL);
if (r < 0)
return r;
r = parse_env_file(p, NEWLINE, "CLASS", &c, NULL);
if (r < 0)
return r;
@@
-814,7
+814,7
@@
_public_ int sd_machine_get_ifindices(const char *machine, int **ifindices) {
assert_return(machine_name_is_valid(machine), -EINVAL);
assert_return(ifindices, -EINVAL);
assert_return(machine_name_is_valid(machine), -EINVAL);
assert_return(ifindices, -EINVAL);
- p = str
append
a("/run/systemd/machines/", machine);
+ p = str
join
a("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "NETIF", &netif, NULL);
if (r < 0)
return r;
r = parse_env_file(p, NEWLINE, "NETIF", &netif, NULL);
if (r < 0)
return r;