blobmsg_json: avoid redefinition of json_object

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 3eeec9b..e58f95d 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -46,11 +46,17 @@ struct blobmsg_policy {
        enum blobmsg_type type;
 };
 
-static inline int blobmsg_hdrlen(int namelen)
+static inline int blobmsg_hdrlen(unsigned int namelen)
 {
        return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
+static inline void blobmsg_clear_name(struct blob_attr *attr)
+{
+       struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
+       hdr->name[0] = 0;
+}
+
 static inline const char *blobmsg_name(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
@@ -65,7 +71,12 @@ static inline int blobmsg_type(const struct blob_attr *attr)
 static inline void *blobmsg_data(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
-       return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+       char *data = (char *) blob_data(attr);
+
+       if (blob_is_extended(attr))
+               data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+
+       return data;
 }
 
 static inline int blobmsg_data_len(const struct blob_attr *attr)
@@ -78,15 +89,29 @@ static inline int blobmsg_data_len(const struct blob_attr *attr)
        return blob_len(attr) - (end - start);
 }
 
+static inline int blobmsg_len(const struct blob_attr *attr)
+{
+       return blobmsg_data_len(attr);
+}
+
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name);
 bool blobmsg_check_attr_list(const struct blob_attr *attr, int type);
+
+/*
+ * blobmsg_check_array: validate array/table and return size
+ *
+ * Checks if all elements of an array or table are valid and have
+ * the specified type. Returns the number of elements in the array
+ */
+int blobmsg_check_array(const struct blob_attr *attr, int type);
+
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
-                  struct blob_attr **tb, void *data, int len);
+                  struct blob_attr **tb, void *data, unsigned int len);
 int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
-                       struct blob_attr **tb, void *data, int len);
+                       struct blob_attr **tb, void *data, unsigned int len);
 
 int blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
-                      const void *data, int len);
+                      const void *data, unsigned int len);
 
 static inline int
 blobmsg_add_u8(struct blob_buf *buf, const char *name, uint8_t val)
@@ -181,7 +206,7 @@ static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
 
 static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 {
-       uint32_t *ptr = blobmsg_data(attr);
+       uint32_t *ptr = (uint32_t *) blobmsg_data(attr);
        uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32;
        tmp |= be32_to_cpu(ptr[1]);
        return tmp;
@@ -189,11 +214,14 @@ static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 
 static inline char *blobmsg_get_string(struct blob_attr *attr)
 {
-       return blobmsg_data(attr);
+       if (!attr)
+               return NULL;
+
+       return (char *) blobmsg_data(attr);
 }
 
-void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);
-void *blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen);
+void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsigned int maxlen);
+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);
@@ -204,9 +232,10 @@ void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format,
 /* blobmsg to json formatting */
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
-       for (rem = blobmsg_data_len(attr), pos = blobmsg_data(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))
+       for (rem = attr ? blobmsg_data_len(attr) : 0, \
+            pos = attr ? blobmsg_data(attr) : 0; \
+            rem > 0 && (blob_pad_len(pos) <= rem) && \
+            (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+            rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 #endif