DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blobmsg: add missing endian conversions

Browse source
This commit is contained in:
Felix Fietkau 2011-11-17 00:47:49 +01:00
parent 5ce9b8912f
commit f565a7af42
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
blobmsg.h
View file

@ -93,18 +93,21 @@ blobmsg_add_u8(struct blob_buf *buf, const char *name, uint8_t val)
static inline int static inline int
blobmsg_add_u16(struct blob_buf *buf, const char *name, uint16_t val) 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); return blobmsg_add_field(buf, BLOBMSG_TYPE_INT16, name, &val, 2);
} }
static inline int static inline int
blobmsg_add_u32(struct blob_buf *buf, const char *name, uint32_t val) 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); return blobmsg_add_field(buf, BLOBMSG_TYPE_INT32, name, &val, 4);
} }
static inline int static inline int
blobmsg_add_u64(struct blob_buf *buf, const char *name, uint64_t val) 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); return blobmsg_add_field(buf, BLOBMSG_TYPE_INT64, name, &val, 8);
} }
@ -157,17 +160,17 @@ static inline bool blobmsg_get_bool(struct blob_attr *attr)
static inline uint16_t blobmsg_get_u16(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) 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) 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); void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);

6
blobmsg_json.c
View file

@ -232,13 +232,13 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
sprintf(buf, "%s", *(uint8_t *)data ? "true" : "false"); sprintf(buf, "%s", *(uint8_t *)data ? "true" : "false");
break; break;
case BLOBMSG_TYPE_INT16: case BLOBMSG_TYPE_INT16:
sprintf(buf, "%d", *(uint16_t *)data); sprintf(buf, "%d", be16_to_cpu(*(uint16_t *)data));
break; break;
case BLOBMSG_TYPE_INT32: case BLOBMSG_TYPE_INT32:
sprintf(buf, "%d", *(uint32_t *)data); sprintf(buf, "%d", be32_to_cpu(*(uint32_t *)data));
break; break;
case BLOBMSG_TYPE_INT64: case BLOBMSG_TYPE_INT64:
sprintf(buf, "%lld", (long long int) *(uint64_t *)data); sprintf(buf, "%lld", (long long int) be64_to_cpu(*(uint64_t *)data));
break; break;
case BLOBMSG_TYPE_STRING: case BLOBMSG_TYPE_STRING:
blobmsg_format_string(s, data); blobmsg_format_string(s, data);