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: add API for appending/reading fixed arrays
[elogind.git]
/
src
/
libsystemd-bus
/
test-bus-marshal.c
diff --git
a/src/libsystemd-bus/test-bus-marshal.c
b/src/libsystemd-bus/test-bus-marshal.c
index 9138f111725188aabb7d52ccfe8d1df519caaa7b..ac519531f79fca90f8d0906b5b6a92a2ec6ea75d 100644
(file)
--- a/
src/libsystemd-bus/test-bus-marshal.c
+++ b/
src/libsystemd-bus/test-bus-marshal.c
@@
-43,6
+43,7
@@
int main(int argc, char *argv[]) {
void *buffer = NULL;
size_t sz;
char *h;
void *buffer = NULL;
size_t sz;
char *h;
+ const int32_t integer_array[] = { -1, -2, 0, 1, 2 }, *return_array;
r = sd_bus_message_new_method_call(NULL, "foobar.waldo", "/", "foobar.waldo", "Piep", &m);
assert_se(r >= 0);
r = sd_bus_message_new_method_call(NULL, "foobar.waldo", "/", "foobar.waldo", "Piep", &m);
assert_se(r >= 0);
@@
-50,6
+51,9
@@
int main(int argc, char *argv[]) {
r = sd_bus_message_append(m, "s", "a string");
assert_se(r >= 0);
r = sd_bus_message_append(m, "s", "a string");
assert_se(r >= 0);
+ r = sd_bus_message_append(m, "s", NULL);
+ assert_se(r < 0);
+
r = sd_bus_message_append(m, "as", 2, "string #1", "string #2");
assert_se(r >= 0);
r = sd_bus_message_append(m, "as", 2, "string #1", "string #2");
assert_se(r >= 0);
@@
-74,6
+78,9
@@
int main(int argc, char *argv[]) {
r = sd_bus_message_close_container(m);
assert_se(r >= 0);
r = sd_bus_message_close_container(m);
assert_se(r >= 0);
+ r = sd_bus_message_append_array(m, 'i', integer_array, sizeof(integer_array));
+ assert_se(r >= 0);
+
r = bus_message_seal(m, 4711);
assert_se(r >= 0);
r = bus_message_seal(m, 4711);
assert_se(r >= 0);
@@
-93,7
+100,9
@@
int main(int argc, char *argv[]) {
GDBusMessage *g;
char *p;
GDBusMessage *g;
char *p;
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
g_type_init();
+#endif
g = g_dbus_message_new_from_blob(buffer, sz, 0, NULL);
p = g_dbus_message_print(g, 0);
g = g_dbus_message_new_from_blob(buffer, sz, 0, NULL);
p = g_dbus_message_print(g, 0);
@@
-116,7
+125,12
@@
int main(int argc, char *argv[]) {
dbus_message_unref(w);
}
dbus_message_unref(w);
}
- free(buffer);
+ m = sd_bus_message_unref(m);
+
+ r = bus_message_from_malloc(buffer, sz, NULL, 0, NULL, NULL, &m);
+ assert_se(r >= 0);
+
+ bus_message_dump(m);
assert_se(sd_bus_message_rewind(m, true) >= 0);
assert_se(sd_bus_message_rewind(m, true) >= 0);
@@
-158,6
+172,11
@@
int main(int argc, char *argv[]) {
assert_se(streq(x, "foobar"));
assert_se(streq(y, "waldo"));
assert_se(streq(x, "foobar"));
assert_se(streq(y, "waldo"));
+ r = sd_bus_message_read_array(m, 'i', (const void**) &return_array, &sz);
+ assert_se(r > 0);
+ assert_se(sz == sizeof(integer_array));
+ assert_se(memcmp(integer_array, return_array, sz) == 0);
+
r = sd_bus_message_peek_type(m, NULL, NULL);
assert_se(r == 0);
r = sd_bus_message_peek_type(m, NULL, NULL);
assert_se(r == 0);