From 8ad802ec3539142e2b1bf06ae8257b302630c184 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 15 Apr 2013 23:39:42 +0200 Subject: [PATCH] bus: fix missing macro argument renaming systemd kay master * b1454bf src/libsystemd-bus/ bus-kernel.c kdbus.h systemd bus: catch up with kernel changes 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; ? kmacleod: hah, so there *is* a reason for using _foo in macros :) kmacleod: thanks! --- src/libsystemd-bus/bus-kernel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index cf5f7ee19..3a69a9823 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) { -- 2.30.2