libsystemd-bus: bring definitions in sync with kdbus

[elogind.git] / src / libsystemd-bus / bus-kernel.h

diff --git a/src/libsystemd-bus/bus-kernel.h b/src/libsystemd-bus/bus-kernel.h
index c4573c92228cb6feb3644d7dbc9e5d430e3e4ccc..69df4f4e9e4b910027e733e054a396b608173cc9 100644 (file)
--- a/src/libsystemd-bus/bus-kernel.h
+++ b/src/libsystemd-bus/bus-kernel.h
@@ -23,16 +23,16 @@
 
 #include "sd-bus.h"
 
-#define KDBUS_ITEM_NEXT(item) \
+#define KDBUS_PART_NEXT(item) \
         (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
 
-#define KDBUS_ITEM_FOREACH(item, head)                                          \
-        for (item = (head)->items;                                              \
-             (uint8_t *)(item) < (uint8_t *)(head) + (head)->size;              \
-             item = KDBUS_ITEM_NEXT(item))
+#define KDBUS_PART_FOREACH(part, head, first)                           \
+        for (part = (head)->first;                                      \
+             (uint8_t *)(part) < (uint8_t *)(head) + (head)->size;      \
+             part = KDBUS_PART_NEXT(part))
 
-#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
-#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE)
+#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data)
+#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_PART_HEADER_SIZE)
 
 #define MEMFD_CACHE_MAX 32