X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=4619643e27d6c97b19878d3cfcaee65fef4e68fa;hp=c4bf10d404abb231fa34a88aa994e3a3e2a1eeab;hb=e8b26ce48d9a423507d2cb6b98094fe5adb1ed9c;hpb=4ab499899ce2ed884a1235ada501c39e355911e7 diff --git a/blobmsg.h b/blobmsg.h index c4bf10d..4619643 100644 --- a/blobmsg.h +++ b/blobmsg.h @@ -16,6 +16,7 @@ #ifndef __BLOBMSG_H #define __BLOBMSG_H +#include #include "blob.h" #define BLOBMSG_ALIGN 2 @@ -77,6 +78,11 @@ static inline int blobmsg_data_len(const struct blob_attr *attr) return blob_len(attr) - (end - start); } +static inline int blobmsg_len(const struct blob_attr *attr) +{ + return blobmsg_data_len(attr); +} + bool blobmsg_check_attr(const struct blob_attr *attr, bool name); bool blobmsg_check_attr_list(const struct blob_attr *attr, int type); int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len, @@ -195,12 +201,18 @@ void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int ma void *blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen); void blobmsg_add_string_buffer(struct blob_buf *buf); +void blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg); +void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...) + __attribute__((format(printf, 3, 4))); + + /* blobmsg to json formatting */ #define blobmsg_for_each_attr(pos, attr, rem) \ - for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \ - rem > 0 && (blob_pad_len(pos) <= rem) && \ - (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ - rem -= blob_pad_len(pos), pos = blob_next(pos)) + for (rem = attr ? blobmsg_data_len(attr) : 0, \ + pos = attr ? blobmsg_data(attr) : 0; \ + rem > 0 && (blob_pad_len(pos) <= rem) && \ + (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ + rem -= blob_pad_len(pos), pos = blob_next(pos)) #endif