Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.openwrt.org/project/libubox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Siverskog <jacob@teenageengineering.com>2014-05-09 16:31:37 +0400
committerFelix Fietkau <nbd@openwrt.org>2014-05-09 16:33:39 +0400
commit4436338588cb317b5799d3aa3107d2cb0b6192cc (patch)
tree789ece3e7b9527e51164b62b4afc2a08e09a207e /blobmsg.h
parentf32a53f92b377fa92dbafd2ce3d2df93fffb314d (diff)
blob/blobmsg: Perform explicit casts from void* to avoid compilation errors when using libubox from C++.
Signed-off by: Jacob Siverskog <jacob@teenageengineering.com>
Diffstat (limited to 'blobmsg.h')
-rw-r--r--blobmsg.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/blobmsg.h b/blobmsg.h
index 98f673a..d8f1045 100644
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -65,7 +65,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 = (struct blobmsg_hdr *) blob_data(attr);
- char *data = blob_data(attr);
+ char *data = (char *) blob_data(attr);
if (blob_is_extended(attr))
data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
@@ -191,7 +191,7 @@ static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
{
- uint32_t *ptr = blobmsg_data(attr);
+ uint32_t *ptr = (uint32_t *) blobmsg_data(attr);
uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32;
tmp |= be32_to_cpu(ptr[1]);
return tmp;
@@ -199,7 +199,7 @@ static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
static inline char *blobmsg_get_string(struct blob_attr *attr)
{
- return blobmsg_data(attr);
+ return (char *) blobmsg_data(attr);
}
void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsigned int maxlen);