blob/blobmsg: add explicit typecasts for attribute iterators

Fixes C++ compatibility.

Reported in https://forum.lede-project.org/t/blobmsg-for-each-attr-from-c/389

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/blob.h b/blob.h
index ab077eab0dba806c53614f06c8dc545a71682ee7..307523d0cad535d79a398cc1c15ac0b37e8ddabd 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -240,7 +240,7 @@ blob_put_u64(struct blob_buf *buf, int id, uint64_t val)
 #define blob_put_int64 blob_put_u64
 
 #define __blob_for_each_attr(pos, attr, rem) \
-       for (pos = (void *) attr; \
+       for (pos = (struct blob_attr *) attr; \
             rem > 0 && (blob_pad_len(pos) <= rem) && \
             (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
             rem -= blob_pad_len(pos), pos = blob_next(pos))
@@ -248,7 +248,7 @@ blob_put_u64(struct blob_buf *buf, int id, uint64_t val)
 
 #define blob_for_each_attr(pos, attr, rem) \
        for (rem = attr ? blob_len(attr) : 0, \
-            pos = attr ? blob_data(attr) : 0; \
+            pos = (struct blob_attr *) (attr ? blob_data(attr) : NULL); \
             rem > 0 && (blob_pad_len(pos) <= rem) && \
             (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
             rem -= blob_pad_len(pos), pos = blob_next(pos))

diff --git a/blobmsg.h b/blobmsg.h
index 84997a67ab5bc347dab0bd0a741bd0fd98ecddb5..861a4e8db9336f81056b18e01809c3a0c08dbfec 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -233,7 +233,7 @@ int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, .
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
        for (rem = attr ? blobmsg_data_len(attr) : 0, \
-            pos = attr ? blobmsg_data(attr) : 0; \
+            pos = (struct blob_attr *) (attr ? blobmsg_data(attr) : NULL); \
             rem > 0 && (blob_pad_len(pos) <= rem) && \
             (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
             rem -= blob_pad_len(pos), pos = blob_next(pos))