chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: keep per-JournalFile location info during iteration
[elogind.git]
/
src
/
machine
/
machine-dbus.c
diff --git
a/src/machine/machine-dbus.c
b/src/machine/machine-dbus.c
index 89c93779d37337d461912cc73c3c4694c982bc73..f6fd9cf3611c5b9904bb14c9d5a4539f1c90f6a8 100644
(file)
--- a/
src/machine/machine-dbus.c
+++ b/
src/machine/machine-dbus.c
@@
-27,7
+27,7
@@
#include "bus-util.h"
#include "bus-label.h"
#include "strv.h"
#include "bus-util.h"
#include "bus-label.h"
#include "strv.h"
-#include "bus-errors.h"
+#include "bus-
common-
errors.h"
#include "copy.h"
#include "fileio.h"
#include "in-addr-util.h"
#include "copy.h"
#include "fileio.h"
#include "in-addr-util.h"
@@
-207,7
+207,7
@@
int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void
if (r < 0)
_exit(EXIT_FAILURE);
if (r < 0)
_exit(EXIT_FAILURE);
- n = local_addresses(&addresses);
+ n = local_addresses(
NULL, 0, AF_UNSPEC,
&addresses);
if (n < 0)
_exit(EXIT_FAILURE);
if (n < 0)
_exit(EXIT_FAILURE);
@@
-344,7
+344,7
@@
int bus_machine_method_get_os_release(sd_bus *bus, sd_bus_message *message, void
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
- r = copy_bytes(fd, pair[1], (off_t) -1);
+ r = copy_bytes(fd, pair[1], (off_t) -1
, false
);
if (r < 0)
_exit(EXIT_FAILURE);
if (r < 0)
_exit(EXIT_FAILURE);