bus: fix missing macro argument renaming

<fdo-vcs> systemd kay master * b1454bf src/libsystemd-bus/ bus-kernel.c kdbus.h
<fdo-vcs> systemd bus: catch up with kernel changes
<kmacleod> kay: randomly looked at your commit, it looks like in KDBUS_FOREACH_ITEM
  you missed changing a (d) to an (i) in (uint8_t*) (d) < (uint8_t*) (k) + (k)->size;  ?
<kay> kmacleod: hah, so there *is* a reason for using _foo in macros :)
<kay> kmacleod: thanks!

diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index cf5f7ee198da7c7b3d63829c2f0072149a0a5f1a..3a69a98231240364edc5cd535398975a39d3abf7 100644 (file)
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -34,7 +34,7 @@
 
 #define KDBUS_FOREACH_ITEM(i, k)                                        \
         for ((i) = (k)->items;                                          \
 
 #define KDBUS_FOREACH_ITEM(i, k)                                        \
         for ((i) = (k)->items;                                          \

-             (uint8_t*) (d) < (uint8_t*) (k) + (k)->size;               \
+             (uint8_t*) (i) < (uint8_t*) (k) + (k)->size;               \

              (i) = (struct kdbus_msg_data*) ((uint8_t*) (i) + ALIGN8((i)->size)))
 
 static int parse_unique_name(const char *s, uint64_t *id) {
              (i) = (struct kdbus_msg_data*) ((uint8_t*) (i) + ALIGN8((i)->size)))
 
 static int parse_unique_name(const char *s, uint64_t *id) {