From: Felix Fietkau Date: Thu, 27 Oct 2011 08:16:56 +0000 (+0200) Subject: make casts from void * explicit to avoid C++ warnings (patch by Arthur Davis) X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=fc20c7a0314afa07f4f873f1a2f1f0095bf8e519;hp=01c6f73ed76ade6f05496f16d682699c02cb1eec make casts from void * explicit to avoid C++ warnings (patch by Arthur Davis) --- diff --git a/blobmsg.h b/blobmsg.h index c266855..b4e6758 100644 --- 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); }