X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-hwdb.h;h=3c44b981d68030700161c74ba13748d59bae25fa;hp=fae9b9fd4bde497b831ce1161e36dea4e935ad27;hb=86e97d599f8b1ca379dce64fadac9b8f6b002ac5;hpb=23fbe14f503c1e98292efc4ba1238adb7dc38d80

diff --git a/src/systemd/sd-hwdb.h b/src/systemd/sd-hwdb.h
index fae9b9fd4..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);
 
-#define FOREACH_HWDB_PROPERTY(hwdb, modalias, key, value)               \
-        if (sd_hwdb_seek(hwdb, modalias) >= 0)                          \
-                while (sd_hwdb_enumerate(hwdb, &(key), &(value)) > 0)
+/* 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) { }                       \
+        else while (sd_hwdb_enumerate(hwdb, &(key), &(value)) > 0)
 
 #endif