X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-hwdb.h;h=3c44b981d68030700161c74ba13748d59bae25fa;hb=07a0d22f9ec5a0cac2385b73dc08b12a811cead8;hp=f41555df7efa8d05e6f4973f661be9251d24a740;hpb=0b9315719154fa7ea1a075e1b3785713f5acc3a1;p=elogind.git

diff --git a/src/systemd/sd-hwdb.h b/src/systemd/sd-hwdb.h
index f41555df7..3c44b981d 100644
--- a/src/systemd/sd-hwdb.h
+++ b/src/systemd/sd-hwdb.h
@@ -39,8 +39,9 @@ int sd_hwdb_get(sd_hwdb *hwdb, const char *modalias, const char *key, const char
 int sd_hwdb_seek(sd_hwdb *hwdb, const char *modalias);
 int sd_hwdb_enumerate(sd_hwdb *hwdb, const char **key, const char **value);
 
+/* the inverse condition avoids ambiguity of danling 'else' after the macro */
 #define SD_HWDB_FOREACH_PROPERTY(hwdb, modalias, key, value)            \
-        if (sd_hwdb_seek(hwdb, modalias) >= 0)                          \
-                while (sd_hwdb_enumerate(hwdb, &(key), &(value)) > 0)
+        if (sd_hwdb_seek(hwdb, modalias) < 0) { }                       \
+        else while (sd_hwdb_enumerate(hwdb, &(key), &(value)) > 0)
 
 #endif