sh/jshn.sh: allow numbers in identifiers for json_get_var()

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index c266855245ab80b69ef77e8faf2ae15d7c731bdf..c47f46973ee68975b7ec22979f77a84280031dd8 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -52,7 +52,7 @@ static inline int blobmsg_hdrlen(int namelen)
 
 static inline const char *blobmsg_name(const struct blob_attr *attr)
 {
-       struct blobmsg_hdr *hdr = blob_data(attr);
+       struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
        return (const char *) hdr->name;
 }
 
@@ -63,7 +63,7 @@ static inline int blobmsg_type(const struct blob_attr *attr)
 
 static inline void *blobmsg_data(const struct blob_attr *attr)
 {
-       struct blobmsg_hdr *hdr = blob_data(attr);
+       struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
        return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
 }
 
@@ -71,8 +71,8 @@ static inline int blobmsg_data_len(const struct blob_attr *attr)
 {
        uint8_t *start, *end;
 
-       start = blob_data(attr);
-       end = blobmsg_data(attr);
+       start = (uint8_t *) blob_data(attr);
+       end = (uint8_t *) blobmsg_data(attr);
 
        return blob_len(attr) - (end - start);
 }
@@ -93,18 +93,21 @@ blobmsg_add_u8(struct blob_buf *buf, const char *name, uint8_t val)
 static inline int
 blobmsg_add_u16(struct blob_buf *buf, const char *name, uint16_t val)
 {
+       val = cpu_to_be16(val);
        return blobmsg_add_field(buf, BLOBMSG_TYPE_INT16, name, &val, 2);
 }
 
 static inline int
 blobmsg_add_u32(struct blob_buf *buf, const char *name, uint32_t val)
 {
+       val = cpu_to_be32(val);
        return blobmsg_add_field(buf, BLOBMSG_TYPE_INT32, name, &val, 4);
 }
 
 static inline int
 blobmsg_add_u64(struct blob_buf *buf, const char *name, uint64_t val)
 {
+       val = cpu_to_be64(val);
        return blobmsg_add_field(buf, BLOBMSG_TYPE_INT64, name, &val, 8);
 }
 
@@ -114,6 +117,13 @@ blobmsg_add_string(struct blob_buf *buf, const char *name, const char *string)
        return blobmsg_add_field(buf, BLOBMSG_TYPE_STRING, name, string, strlen(string) + 1);
 }
 
+static inline int
+blobmsg_add_blob(struct blob_buf *buf, struct blob_attr *attr)
+{
+       return blobmsg_add_field(buf, blobmsg_type(attr), blobmsg_name(attr),
+                                blobmsg_data(attr), blobmsg_data_len(attr));
+}
+
 void *blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array);
 
 static inline void *
@@ -157,17 +167,17 @@ static inline bool blobmsg_get_bool(struct blob_attr *attr)
 
 static inline uint16_t blobmsg_get_u16(struct blob_attr *attr)
 {
-       return *(uint16_t *) blobmsg_data(attr);
+       return be16_to_cpu(*(uint16_t *) blobmsg_data(attr));
 }
 
 static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
 {
-       return *(uint32_t *) blobmsg_data(attr);
+       return be32_to_cpu(*(uint32_t *) blobmsg_data(attr));
 }
 
 static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 {
-       return *(uint64_t *) blobmsg_data(attr);
+       return be64_to_cpu(*(uint64_t *) blobmsg_data(attr));
 }
 
 void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);