bus: catch up with kernel changes

[elogind.git] / src / libsystemd-bus / bus-socket.c

diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c
index 5e285c9e528ed669c3904f5a91041261391bd92d..8a86b02c681080e8f95c8a78c59dc3cad20bf368 100644 (file)
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd-bus/bus-socket.c
@@ -77,15 +77,8 @@ static void bus_message_setup_iovec(sd_bus_message *m) {
 
         append_iovec(m, m->header, sizeof(*m->header));
 
-        if (m->fields) {
-                append_iovec(m, m->fields, m->header->fields_size);
-
-                if (m->header->fields_size % 8 != 0) {
-                        static const uint8_t padding[7] = {};
-
-                        append_iovec(m, padding, 8 - (m->header->fields_size % 8));
-                }
-        }
+        if (m->fields)
+                append_iovec(m, m->fields, ALIGN8(m->header->fields_size));
 
         if (m->body)
                 append_iovec(m, m->body, m->header->body_size);
@@ -762,7 +755,7 @@ int bus_socket_write_message(sd_bus *bus, sd_bus_message *m, size_t *idx) {
         assert(idx);
         assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
 
-        if (*idx >= bus_message_size(m))
+        if (*idx >= BUS_MESSAGE_SIZE(m))
                 return 0;
 
         bus_message_setup_iovec(m);