[BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
[BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
[BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
+ [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
};
static uint16_t
len = blobmsg_data_len(attr);
data = blobmsg_data(attr);
- if (!id || id > BLOBMSG_TYPE_LAST)
+ if (id > BLOBMSG_TYPE_LAST)
return false;
if (!blob_type[id])
blob_id(attr) != policy[i].type)
continue;
- if (!blobmsg_check_attr(attr, true))
+ if (!blobmsg_check_attr(attr, false))
return -1;
if (tb[i])
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;
}
return (void *)offset;
}
+void
+blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
+{
+ va_list arg2;
+ char cbuf;
+ int len;
+
+ va_copy(arg2, arg);
+ len = vsnprintf(&cbuf, sizeof(cbuf), format, arg2);
+ va_end(arg2);
+
+ vsprintf(blobmsg_alloc_string_buffer(buf, name, len + 1), format, arg);
+ blobmsg_add_string_buffer(buf);
+}
+
+void
+blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ blobmsg_vprintf(buf, name, format, ap);
+ va_end(ap);
+}
+
void *
blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
{
return data_dest;
}
+void *
+blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen)
+{
+ struct blob_attr *attr = blob_next(buf->head);
+ int offset = attr_to_offset(buf, blob_next(buf->head)) + blob_pad_len(attr) - BLOB_COOKIE;
+ int required = maxlen - (buf->buflen - offset);
+
+ if (required <= 0)
+ goto out;
+
+ blob_buf_grow(buf, required);
+ attr = blob_next(buf->head);
+
+out:
+ return blobmsg_data(attr);
+}
+
void
blobmsg_add_string_buffer(struct blob_buf *buf)
{