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: message_append_basic() - allow string == NULL
[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 ae61476d57d989eb5921f33f4137b62b10557e00..5e29a7b6a2ac4adeba8d1eced199961dd1fda038 100644
(file)
--- a/
src/libsystemd-bus/test-bus-marshal.c
+++ b/
src/libsystemd-bus/test-bus-marshal.c
@@
-41,7
+41,7
@@
int main(int argc, char *argv[]) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *copy = NULL;
int r, boolean;
int main(int argc, char *argv[]) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *copy = NULL;
int r, boolean;
- const char *x, *y, *z, *a, *b, *c, *d;
+ const char *x, *
x2, *
y, *z, *a, *b, *c, *d;
uint8_t u, v;
void *buffer = NULL;
size_t sz;
uint8_t u, v;
void *buffer = NULL;
size_t sz;
@@
-59,7
+59,7
@@
int main(int argc, char *argv[]) {
assert_se(r >= 0);
r = sd_bus_message_append(m, "s", NULL);
assert_se(r >= 0);
r = sd_bus_message_append(m, "s", NULL);
- assert_se(r
<
0);
+ 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);
@@
-160,9
+160,10
@@
int main(int argc, char *argv[]) {
assert_se(sd_bus_message_rewind(m, true) >= 0);
assert_se(sd_bus_message_rewind(m, true) >= 0);
- r = sd_bus_message_read(m, "s
as", &x
, 2, &y, &z);
+ r = sd_bus_message_read(m, "s
sas", &x, &x2
, 2, &y, &z);
assert_se(r > 0);
assert_se(streq(x, "a string"));
assert_se(r > 0);
assert_se(streq(x, "a string"));
+ assert_se(streq(x2, ""));
assert_se(streq(y, "string #1"));
assert_se(streq(z, "string #2"));
assert_se(streq(y, "string #1"));
assert_se(streq(z, "string #2"));
@@
-241,7
+242,7
@@
int main(int argc, char *argv[]) {
assert_se(sd_bus_message_verify_type(m, 's', NULL) > 0);
assert_se(sd_bus_message_verify_type(m, 's', NULL) > 0);
- r = sd_bus_message_skip(m, "sas");
+ r = sd_bus_message_skip(m, "s
s
as");
assert_se(r > 0);
assert_se(sd_bus_message_verify_type(m, 's', NULL) > 0);
assert_se(r > 0);
assert_se(sd_bus_message_verify_type(m, 's', NULL) > 0);