[BLOBMSG_TYPE_INT16] = BLOB_ATTR_INT16,
[BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
[BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
+ [BLOBMSG_TYPE_DOUBLE] = BLOB_ATTR_DOUBLE,
[BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
[BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
};
return blob_check_type(data, len, blob_type[id]);
}
-bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
+int blobmsg_check_array(const struct blob_attr *attr, int type)
{
struct blob_attr *cur;
bool name;
int rem;
+ int size = 0;
switch (blobmsg_type(attr)) {
case BLOBMSG_TYPE_TABLE:
name = false;
break;
default:
- return false;
+ return -1;
}
blobmsg_for_each_attr(cur, attr, rem) {
- if (blobmsg_type(cur) != type)
- return false;
+ if (type != BLOBMSG_TYPE_UNSPEC && blobmsg_type(cur) != type)
+ return -1;
if (!blobmsg_check_attr(cur, name))
- return false;
+ return -1;
+
+ size++;
}
- return true;
+ return size;
+}
+
+bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
+{
+ return blobmsg_check_array(attr, type) >= 0;
}
int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
name = "";
head = blobmsg_new(buf, type, name, 0, &data);
+ if (!head)
+ return NULL;
blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blobmsg_hdrlen(strlen(name)));
buf->head = head;
return (void *)offset;
}
-void
+int
blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
{
va_list arg2;
char cbuf;
- int len;
+ char *sbuf;
+ int len, ret;
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);
+ sbuf = blobmsg_alloc_string_buffer(buf, name, len + 1);
+ if (!sbuf)
+ return -1;
+ ret = vsprintf(sbuf, format, arg);
blobmsg_add_string_buffer(buf);
+
+ return ret;
}
-void
+int
blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
{
va_list ap;
+ int ret;
va_start(ap, format);
- blobmsg_vprintf(buf, name, format, ap);
+ ret = blobmsg_vprintf(buf, name, format, ap);
va_end(ap);
+
+ return ret;
}
void *
if (!attr)
return NULL;
- data_dest = blobmsg_data(attr);
blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blob_pad_len(attr));
blob_set_raw_len(attr, blob_raw_len(attr) - maxlen);
if (required <= 0)
goto out;
- blob_buf_grow(buf, required);
+ if (!blob_buf_grow(buf, required))
+ return NULL;
attr = blob_next(buf->head);
out: