From 18b3c49296adf5937700c5a60fb13a159d599eae Mon Sep 17 00:00:00 2001 From: James Myatt Date: Thu, 5 Feb 2015 15:59:19 +0000 Subject: [PATCH] Use more appropriate casts --- json_object.c | 6 +++--- linkhash.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/json_object.c b/json_object.c index 9b89bb7..d0aba48 100644 --- a/json_object.c +++ b/json_object.c @@ -409,7 +409,7 @@ void json_object_object_add(struct json_object* jso, const char *key, lh_table_insert(jso->o.c_object, strdup(key), val); return; } - existing_value = (void *)existing_entry->v; + existing_value = (json_object *)existing_entry->v; if (existing_value) json_object_put(existing_value); existing_entry->v = val; @@ -661,8 +661,8 @@ struct json_object* json_object_new_double_s(double d, const char *ds) int json_object_userdata_to_json_string(struct json_object *jso, struct printbuf *pb, int level, int flags) { - int userdata_len = strlen(jso->_userdata); - printbuf_memappend(pb, jso->_userdata, userdata_len); + int userdata_len = strlen((const char *)jso->_userdata); + printbuf_memappend(pb, (const char *)jso->_userdata, userdata_len); return userdata_len; } diff --git a/linkhash.c b/linkhash.c index 989980c..572f4dc 100644 --- a/linkhash.c +++ b/linkhash.c @@ -415,7 +415,7 @@ unsigned long lh_char_hash(const void *k) #if defined __GNUC__ __sync_val_compare_and_swap(&random_seed, -1, seed); #elif defined _MSC_VER - InterlockedCompareExchange(&random_seed, seed, -1); + InterlockedCompareExchange((LONG *)&random_seed, seed, -1); #else #warning "racy random seed initializtion if used by multiple threads" random_seed = seed; /* potentially racy */