chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
13c299d
)
bus: add macro for iterating through body parts of a message
author
Lennart Poettering
<lennart@poettering.net>
Tue, 14 May 2013 23:43:15 +0000
(
01:43
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 14 May 2013 23:43:15 +0000
(
01:43
+0200)
src/libsystemd-bus/bus-kernel.c
patch
|
blob
|
history
src/libsystemd-bus/bus-message.c
patch
|
blob
|
history
src/libsystemd-bus/bus-message.h
patch
|
blob
|
history
src/libsystemd-bus/bus-socket.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/bus-kernel.c
b/src/libsystemd-bus/bus-kernel.c
index 5b1769c0e15817899472fdc2f2330a300e5e9bb5..3aa408414ee3f79029d5e090e4f17bb4d2021b91 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-184,12
+184,13
@@
static int bus_message_setup_bloom(sd_bus_message *m, void *bloom) {
}
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
}
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
+ struct bus_body_part *part;
struct kdbus_item *d;
bool well_known;
uint64_t unique;
size_t sz, dl;
struct kdbus_item *d;
bool well_known;
uint64_t unique;
size_t sz, dl;
+ unsigned i;
int r;
int r;
- struct bus_body_part *part;
assert(b);
assert(m);
assert(b);
assert(m);
@@
-253,7
+254,7
@@
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
if (m->fields)
append_payload_vec(&d, m->fields, ALIGN8(m->header->fields_size));
if (m->fields)
append_payload_vec(&d, m->fields, ALIGN8(m->header->fields_size));
-
for (part = &m->body; part && part->size > 0; part = part->next
)
+
MESSAGE_FOREACH_PART(part, i, m
)
append_payload_vec(&d, part->data, part->size);
if (m->kdbus->dst_id == KDBUS_DST_ID_BROADCAST) {
append_payload_vec(&d, part->data, part->size);
if (m->kdbus->dst_id == KDBUS_DST_ID_BROADCAST) {
diff --git
a/src/libsystemd-bus/bus-message.c
b/src/libsystemd-bus/bus-message.c
index 721dafe38b800c761b635856ac03631fe5ca7390..3790102a757ae4259dceb9d585fe51023a3a3877 100644
(file)
--- a/
src/libsystemd-bus/bus-message.c
+++ b/
src/libsystemd-bus/bus-message.c
@@
-3600,9
+3600,11
@@
int bus_message_seal(sd_bus_message *m, uint64_t serial) {
m->header->fields_size -= a;
}
m->header->fields_size -= a;
}
-
for (i = 0, part = &m->body; i < m->n_body_parts; i++, part = part->next
)
- if (part->memfd >= 0 &&
part->sealed)
+
MESSAGE_FOREACH_PART(part, i, m
)
+ if (part->memfd >= 0 &&
!part->sealed) {
ioctl(part->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1);
ioctl(part->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1);
+ part->sealed = true;
+ }
m->header->serial = serial;
m->sealed = true;
m->header->serial = serial;
m->sealed = true;
@@
-3906,7
+3908,7
@@
int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) {
e = mempset(e, 0, 8 - (m->header->fields_size % 8));
}
e = mempset(e, 0, 8 - (m->header->fields_size % 8));
}
-
for (i = 0, part = &m->body; i < m->n_body_parts; i++, part = part->next
)
+
MESSAGE_FOREACH_PART(part, i, m
)
e = mempcpy(e, part->data, part->size);
assert(total == (size_t) ((uint8_t*) e - (uint8_t*) p));
e = mempcpy(e, part->data, part->size);
assert(total == (size_t) ((uint8_t*) e - (uint8_t*) p));
diff --git
a/src/libsystemd-bus/bus-message.h
b/src/libsystemd-bus/bus-message.h
index 1c50c7357a164083489c1c0dd28eb8c03a6832be..01a1e01230b21ff0088fd22fa2cc8367924da229 100644
(file)
--- a/
src/libsystemd-bus/bus-message.h
+++ b/
src/libsystemd-bus/bus-message.h
@@
-217,3
+217,6
@@
int bus_message_parse_fields(sd_bus_message *m);
int bus_header_size(struct bus_header *h, size_t *sum);
struct bus_body_part *message_append_part(sd_bus_message *m);
int bus_header_size(struct bus_header *h, size_t *sum);
struct bus_body_part *message_append_part(sd_bus_message *m);
+
+#define MESSAGE_FOREACH_PART(part, i, m) \
+ for ((i) = 0, (part) = &(m)->body; (i) < (m)->n_body_parts; (i)++, (part) = (part)->next)
diff --git
a/src/libsystemd-bus/bus-socket.c
b/src/libsystemd-bus/bus-socket.c
index 4a07869157f9fb4d6b581c3f33a247ed5095b578..f43b7da05ca651fa158a07e850cf0531f4a840dc 100644
(file)
--- a/
src/libsystemd-bus/bus-socket.c
+++ b/
src/libsystemd-bus/bus-socket.c
@@
-102,7
+102,7
@@
static int bus_message_setup_iovec(sd_bus_message *m) {
return r;
}
return r;
}
-
for (i = 0, part = &m->body; i < m->n_body_parts; i++, part = part->next)
{
+
MESSAGE_FOREACH_PART(part, i, m)
{
r = append_iovec(m, part->data, part->size);
if (r < 0)
return r;
r = append_iovec(m, part->data, part->size);
if (r < 0)
return r;