[systemd-commits] src/libsystemd-bus

[Kay Sievers]

 src/libsystemd-bus/bus-kernel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ad802ec3539142e2b1bf06ae8257b302630c184
Author: Kay Sievers <kay at vrfy.org>
Date:   Mon Apr 15 23:39:42 2013 +0200

    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 cf5f7ee..3a69a98 100644
--- 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;                                          \
-             (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) {