summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2017-04-20 11:33:54 +0200
committerGravatar Nikias Bassen2017-04-20 11:33:54 +0200
commitaf52f0420a27f88174ad87c6a0f2cfb7cb426ad9 (patch)
tree97dfecd74036f9591446d030693a60bd378fc86e /src
parentd6c437575f30094cce4f0747e45a1f12880ce89b (diff)
downloadlibplist-af52f0420a27f88174ad87c6a0f2cfb7cb426ad9.tar.gz
libplist-af52f0420a27f88174ad87c6a0f2cfb7cb426ad9.tar.bz2
bplist: Suppress compiler warnings with proper casts
Diffstat (limited to 'src')
-rw-r--r--src/bplist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bplist.c b/src/bplist.c
index 8e0dcd1..fe80458 100644
--- a/src/bplist.c
+++ b/src/bplist.c
@@ -183,7 +183,7 @@ union plist_uint_ptr
#endif
#if __has_builtin(__builtin_umulll_overflow) || __GNUC__ >= 5
-#define uint64_mul_overflow(a, b, r) __builtin_umulll_overflow(a, b, r)
+#define uint64_mul_overflow(a, b, r) __builtin_umulll_overflow(a, b, (unsigned long long*)r)
#else
static int uint64_mul_overflow(uint64_t a, uint64_t b, uint64_t *res)
{
@@ -575,7 +575,7 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
uint16_t type = 0;
uint64_t size = 0;
uint64_t pobject = 0;
- uint64_t poffset_table = (uint64_t)bplist->offset_table;
+ uint64_t poffset_table = (uint64_t)(uintptr_t)bplist->offset_table;
if (!object)
return NULL;
@@ -613,7 +613,7 @@ static plist_t parse_bin_node(struct bplist_data *bplist, const char** object)
}
}
- pobject = (uint64_t)*object;
+ pobject = (uint64_t)(uintptr_t)*object;
switch (type)
{