projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils: fix build error with g++
[project/libubox.git]
/
blobmsg.c
diff --git
a/blobmsg.c
b/blobmsg.c
index
47ee9e7
..
c2bb717
100644
(file)
--- a/
blobmsg.c
+++ b/
blobmsg.c
@@
-20,6
+20,7
@@
static const int blob_type[__BLOBMSG_TYPE_LAST] = {
[BLOBMSG_TYPE_INT16] = BLOB_ATTR_INT16,
[BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
[BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
[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,
};
[BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
[BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
};
@@
-62,11
+63,12
@@
bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
return blob_check_type(data, len, blob_type[id]);
}
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;
{
struct blob_attr *cur;
bool name;
int rem;
+ int size = 0;
switch (blobmsg_type(attr)) {
case BLOBMSG_TYPE_TABLE:
switch (blobmsg_type(attr)) {
case BLOBMSG_TYPE_TABLE:
@@
-76,22
+78,29
@@
bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
name = false;
break;
default:
name = false;
break;
default:
- return
false
;
+ return
-1
;
}
blobmsg_for_each_attr(cur, attr, rem) {
}
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))
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,
}
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)
{
struct blob_attr *attr;
int i = 0;
{
struct blob_attr *attr;
int i = 0;
@@
-118,7
+127,7
@@
int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
int blobmsg_parse(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, int len)
+ struct blob_attr **tb, void *data,
unsigned
int len)
{
struct blobmsg_hdr *hdr;
struct blob_attr *attr;
{
struct blobmsg_hdr *hdr;
struct blob_attr *attr;
@@
-203,7
+212,7
@@
attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
void *
blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
{
void *
blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
{
- struct blob_attr *head
= buf->head
;
+ struct blob_attr *head;
int type = array ? BLOBMSG_TYPE_ARRAY : BLOBMSG_TYPE_TABLE;
unsigned long offset = attr_to_offset(buf, buf->head);
void *data;
int type = array ? BLOBMSG_TYPE_ARRAY : BLOBMSG_TYPE_TABLE;
unsigned long offset = attr_to_offset(buf, buf->head);
void *data;
@@
-212,38
+221,49
@@
blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
name = "";
head = blobmsg_new(buf, type, name, 0, &data);
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;
}
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;
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);
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);
blobmsg_add_string_buffer(buf);
+
+ return ret;
}
}
-void
+int
blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
{
va_list ap;
blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
{
va_list ap;
+ int ret;
va_start(ap, format);
va_start(ap, format);
- blobmsg_vprintf(buf, name, format, ap);
+
ret =
blobmsg_vprintf(buf, name, format, ap);
va_end(ap);
va_end(ap);
+
+ return ret;
}
void *
}
void *
-blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
+blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name,
unsigned
int maxlen)
{
struct blob_attr *attr;
void *data_dest;
{
struct blob_attr *attr;
void *data_dest;
@@
-252,7
+272,6
@@
blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
if (!attr)
return NULL;
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);
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);
@@
-260,7
+279,7
@@
blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
}
void *
}
void *
-blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen)
+blobmsg_realloc_string_buffer(struct blob_buf *buf,
unsigned
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;
{
struct blob_attr *attr = blob_next(buf->head);
int offset = attr_to_offset(buf, blob_next(buf->head)) + blob_pad_len(attr) - BLOB_COOKIE;
@@
-269,7
+288,8
@@
blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen)
if (required <= 0)
goto out;
if (required <= 0)
goto out;
- blob_buf_grow(buf, required);
+ if (!blob_buf_grow(buf, required))
+ return NULL;
attr = blob_next(buf->head);
out:
attr = blob_next(buf->head);
out:
@@
-294,7
+314,7
@@
blobmsg_add_string_buffer(struct blob_buf *buf)
int
blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
int
blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
- const void *data, int len)
+ const void *data,
unsigned
int len)
{
struct blob_attr *attr;
void *data_dest;
{
struct blob_attr *attr;
void *data_dest;