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: use ENXIO as error condition when trying to exit a container when we are not...
[elogind.git]
/
src
/
libsystemd-bus
/
bus-message.c
diff --git
a/src/libsystemd-bus/bus-message.c
b/src/libsystemd-bus/bus-message.c
index b6972ac126d6e75391e4602ad0a785d0936b4360..1a50226b01292debae278ce0df43598625f3ad2e 100644
(file)
--- a/
src/libsystemd-bus/bus-message.c
+++ b/
src/libsystemd-bus/bus-message.c
@@
-2430,7
+2430,7
@@
static bool message_end_of_array(sd_bus_message *m, size_t index) {
return index >= c->begin + BUS_MESSAGE_BSWAP32(m, *c->array_size);
}
return index >= c->begin + BUS_MESSAGE_BSWAP32(m, *c->array_size);
}
-int sd_bus_message_at_end(sd_bus_message *m, int complete) {
+
_public_
int sd_bus_message_at_end(sd_bus_message *m, int complete) {
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
@@
-3018,7
+3018,7
@@
_public_ int sd_bus_message_exit_container(sd_bus_message *m) {
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
- assert_return(m->n_containers > 0, -E
INVAL
);
+ assert_return(m->n_containers > 0, -E
NXIO
);
c = message_get_container(m);
if (c->enclosing == SD_BUS_TYPE_ARRAY) {
c = message_get_container(m);
if (c->enclosing == SD_BUS_TYPE_ARRAY) {
@@
-3030,7
+3030,7
@@
_public_ int sd_bus_message_exit_container(sd_bus_message *m) {
} else {
if (c->signature && c->signature[c->index] != 0)
} else {
if (c->signature && c->signature[c->index] != 0)
- return -E
INVAL
;
+ return -E
BUSY
;
}
free(c->signature);
}
free(c->signature);
@@
-3928,7
+3928,7
@@
int bus_message_parse_fields(sd_bus_message *m) {
if (!streq(signature, "s"))
return -EBADMSG;
if (!streq(signature, "s"))
return -EBADMSG;
- r = message_peek_field_string(m, se
rvice
_name_is_valid, &ri, &m->destination);
+ r = message_peek_field_string(m, se
nder
_name_is_valid, &ri, &m->destination);
break;
case SD_BUS_MESSAGE_HEADER_SENDER:
break;
case SD_BUS_MESSAGE_HEADER_SENDER:
@@
-3939,7
+3939,7
@@
int bus_message_parse_fields(sd_bus_message *m) {
if (!streq(signature, "s"))
return -EBADMSG;
if (!streq(signature, "s"))
return -EBADMSG;
- r = message_peek_field_string(m, se
rvice
_name_is_valid, &ri, &m->sender);
+ r = message_peek_field_string(m, se
nder
_name_is_valid, &ri, &m->sender);
break;
break;