blobmsg_json: unconditionally use blobmsg data/len accessor functions

[project/libubox.git] / blob.c

diff --git a/blob.c b/blob.c
index e74f07f..2da7cac 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -40,30 +40,36 @@ blob_init(struct blob_attr *attr, int id, unsigned int len)
 static inline struct blob_attr *
 offset_to_attr(struct blob_buf *buf, int offset)
 {
-       void *ptr = (char *)buf->buf + offset;
+       void *ptr = (char *)buf->buf + offset - BLOB_COOKIE;
        return ptr;
 }
 
 static inline int
 attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
 {
-       return (char *)attr - (char *) buf->buf;
+       return (char *)attr - (char *) buf->buf + BLOB_COOKIE;
+}
+
+void
+blob_buf_grow(struct blob_buf *buf, int required)
+{
+       int offset_head = attr_to_offset(buf, buf->head);
+
+       if (!buf->grow || !buf->grow(buf, required))
+               return;
+
+       buf->head = offset_to_attr(buf, offset_head);
 }
 
 static struct blob_attr *
 blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
 {
        int offset = attr_to_offset(buf, pos);
-       int required = (offset + sizeof(struct blob_attr) + payload) - buf->buflen;
+       int required = (offset - BLOB_COOKIE + sizeof(struct blob_attr) + payload) - buf->buflen;
        struct blob_attr *attr;
 
        if (required > 0) {
-               int offset_head = attr_to_offset(buf, buf->head);
-
-               if (!buf->grow || !buf->grow(buf, required))
-                       return NULL;
-
-               buf->head = offset_to_attr(buf, offset_head);
+               blob_buf_grow(buf, required);
                attr = offset_to_attr(buf, offset);
        } else {
                attr = pos;
@@ -109,10 +115,9 @@ blob_fill_pad(struct blob_attr *attr)
 void
 blob_set_raw_len(struct blob_attr *attr, unsigned int len)
 {
-       int id = blob_id(attr);
        len &= BLOB_ATTR_LEN_MASK;
-       len |= (id << BLOB_ATTR_ID_SHIFT) & BLOB_ATTR_ID_MASK;
-       attr->id_len = cpu_to_be32(len);
+       attr->id_len &= ~cpu_to_be32(BLOB_ATTR_LEN_MASK);
+       attr->id_len |= cpu_to_be32(len);
 }
 
 struct blob_attr *
@@ -129,6 +134,20 @@ blob_new(struct blob_buf *buf, int id, int payload)
 }
 
 struct blob_attr *
+blob_put_raw(struct blob_buf *buf, const void *ptr, int len)
+{
+       struct blob_attr *attr;
+
+       if (len < sizeof(struct blob_attr) || !ptr)
+               return NULL;
+
+       attr = blob_add(buf, blob_next(buf->head), 0, len - sizeof(struct blob_attr));
+       blob_set_raw_len(buf->head, blob_pad_len(buf->head) + len);
+       memcpy(attr, ptr, len);
+       return attr;
+}
+
+struct blob_attr *
 blob_put(struct blob_buf *buf, int id, const void *ptr, int len)
 {
        struct blob_attr *attr;