chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: fix parsing of AcquireName() response
[elogind.git]
/
src
/
libsystemd-bus
/
test-bus-objects.c
diff --git
a/src/libsystemd-bus/test-bus-objects.c
b/src/libsystemd-bus/test-bus-objects.c
index 043aa90b3c82d01e0ff47ef4edb5173380cec095..0ab7a148d30d2f48e6d97756161410ae01c857d3 100644
(file)
--- a/
src/libsystemd-bus/test-bus-objects.c
+++ b/
src/libsystemd-bus/test-bus-objects.c
@@
-61,6
+61,9
@@
static int something_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_
log_info("AlterSomething() called, got %s, returning %s", s, n);
log_info("AlterSomething() called, got %s, returning %s", s, n);
+ /* This should fail, since the return type doesn't match */
+ assert_se(sd_bus_reply_method_return(m, "u", 4711) == -ENOMSG);
+
r = sd_bus_reply_method_return(m, "s", n);
assert_se(r >= 0);
r = sd_bus_reply_method_return(m, "s", n);
assert_se(r >= 0);
@@
-182,7
+185,7
@@
static const sd_bus_vtable vtable2[] = {
SD_BUS_VTABLE_END
};
SD_BUS_VTABLE_END
};
-static int enumerator_callback(sd_bus *b, const char *path,
char ***nodes, void *userdata
) {
+static int enumerator_callback(sd_bus *b, const char *path,
void *userdata, char ***nodes, sd_bus_error *error
) {
if (object_path_startswith("/value", path))
assert_se(*nodes = strv_new("/value/a", "/value/b", "/value/c", NULL));
if (object_path_startswith("/value", path))
assert_se(*nodes = strv_new("/value/a", "/value/b", "/value/c", NULL));