From 77a629375d7387a33a59509d9d751a8798134cab Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 29 Nov 2016 14:02:54 +0100 Subject: [PATCH] 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 --- blob.h | 4 ++-- blobmsg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blob.h b/blob.h index ab077ea..307523d 100644 --- 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 84997a6..861a4e8 100644 --- 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)) -- 2.25.1