DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blob/blobmsg: add explicit typecasts for attribute iterators

Browse source 
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>
This commit is contained in:
Felix Fietkau 2016-11-29 14:02:54 +01:00
parent d0312bd9b1
commit 77a629375d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
blob.h
View file

@ -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_put_int64 blob_put_u64
#define __blob_for_each_attr(pos, attr, rem) \ #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) && \ rem > 0 && (blob_pad_len(pos) <= rem) && \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \ (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos)) 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) \ #define blob_for_each_attr(pos, attr, rem) \
for (rem = attr ? blob_len(attr) : 0, \ 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) && \ rem > 0 && (blob_pad_len(pos) <= rem) && \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \ (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos)) rem -= blob_pad_len(pos), pos = blob_next(pos))

2
blobmsg.h
View file

@ -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) \ #define blobmsg_for_each_attr(pos, attr, rem) \
for (rem = attr ? blobmsg_data_len(attr) : 0, \ 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) && \ rem > 0 && (blob_pad_len(pos) <= rem) && \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \ (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos)) rem -= blob_pad_len(pos), pos = blob_next(pos))