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-bus: don't clobber return values on failure in bus_kernel_open_bus_fd()
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
test-bus-kernel.c
diff --git
a/src/libsystemd/sd-bus/test-bus-kernel.c
b/src/libsystemd/sd-bus/test-bus-kernel.c
index b138d390d9e1e070ec7f621fa8ee8c4a2e6513c8..0e6c2ac40210b5235689b66d7abec6853b3c0c59 100644
(file)
--- a/
src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/
src/libsystemd/sd-bus/test-bus-kernel.c
@@
-70,10
+70,10
@@
int main(int argc, char *argv[]) {
assert_se(r >= 0);
assert_se(sd_bus_negotiate_timestamp(a, 1) >= 0);
assert_se(r >= 0);
assert_se(sd_bus_negotiate_timestamp(a, 1) >= 0);
- assert_se(sd_bus_negotiate_creds(a, _SD_BUS_CREDS_ALL) >= 0);
+ assert_se(sd_bus_negotiate_creds(a,
true,
_SD_BUS_CREDS_ALL) >= 0);
- assert_se(sd_bus_negotiate_timestamp(b,
1
) >= 0);
- assert_se(sd_bus_negotiate_creds(b,
_SD_BUS_CREDS_ALL
) >= 0);
+ assert_se(sd_bus_negotiate_timestamp(b,
0
) >= 0);
+ assert_se(sd_bus_negotiate_creds(b,
true, 0
) >= 0);
r = sd_bus_start(a);
assert_se(r >= 0);
r = sd_bus_start(a);
assert_se(r >= 0);
@@
-81,6
+81,9
@@
int main(int argc, char *argv[]) {
r = sd_bus_start(b);
assert_se(r >= 0);
r = sd_bus_start(b);
assert_se(r >= 0);
+ assert_se(sd_bus_negotiate_timestamp(b, 1) >= 0);
+ assert_se(sd_bus_negotiate_creds(b, true, _SD_BUS_CREDS_ALL) >= 0);
+
r = sd_bus_get_unique_name(a, &ua);
assert_se(r >= 0);
printf("unique a: %s\n", ua);
r = sd_bus_get_unique_name(a, &ua);
assert_se(r >= 0);
printf("unique a: %s\n", ua);
@@
-117,7
+120,7
@@
int main(int argc, char *argv[]) {
assert_se(r > 0);
assert_se(m);
assert_se(r > 0);
assert_se(m);
- bus_message_dump(m, stdout,
true
);
+ bus_message_dump(m, stdout,
BUS_MESSAGE_DUMP_WITH_HEADER
);
assert_se(sd_bus_message_rewind(m, true) >= 0);
r = sd_bus_message_read(m, "s", &the_string);
assert_se(sd_bus_message_rewind(m, true) >= 0);
r = sd_bus_message_read(m, "s", &the_string);
@@
-154,7
+157,7
@@
int main(int argc, char *argv[]) {
assert_se(r > 0);
assert_se(m);
assert_se(r > 0);
assert_se(m);
- bus_message_dump(m, stdout,
true
);
+ bus_message_dump(m, stdout,
BUS_MESSAGE_DUMP_WITH_HEADER
);
assert_se(sd_bus_message_rewind(m, true) >= 0);
if (sd_bus_message_is_method_call(m, "an.inter.face", "AMethod")) {
assert_se(sd_bus_message_rewind(m, true) >= 0);
if (sd_bus_message_is_method_call(m, "an.inter.face", "AMethod")) {