libubox: drop legacy json-c support

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index d8f1045..e58f95d 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -51,6 +51,12 @@ static inline int blobmsg_hdrlen(unsigned int namelen)
        return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
        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);
 static inline const char *blobmsg_name(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);


@@ -90,6 +96,15 @@ static inline int blobmsg_len(const struct blob_attr *attr)
 
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name);
 bool blobmsg_check_attr_list(const struct blob_attr *attr, int type);
 
 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, unsigned int len);
 int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
                   struct blob_attr **tb, void *data, unsigned int len);
 int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,


@@ -199,6 +214,9 @@ static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 
 static inline char *blobmsg_get_string(struct blob_attr *attr)
 {
 
 static inline char *blobmsg_get_string(struct blob_attr *attr)
 {

+       if (!attr)
+               return NULL;
+

        return (char *) blobmsg_data(attr);
 }
 
        return (char *) blobmsg_data(attr);
 }