blob/blobmsg: add explicit typecasts for attribute iterators

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 7041aca..861a4e8 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -214,6 +214,9 @@ static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 
 static inline char *blobmsg_get_string(struct blob_attr *attr)
 {
+       if (!attr)
+               return NULL;
+
        return (char *) blobmsg_data(attr);
 }
 
@@ -221,8 +224,8 @@ void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsign
 void *blobmsg_realloc_string_buffer(struct blob_buf *buf, unsigned int maxlen);
 void blobmsg_add_string_buffer(struct blob_buf *buf);
 
-void blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg);
-void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+int blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg);
+int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
      __attribute__((format(printf, 3, 4)));
 
 
@@ -230,7 +233,7 @@ void 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))