Use more appropriate casts

diff --git a/json_object.c b/json_object.c
index 9b89bb7673ac2798cbb2a33bfc319214d03203f1..d0aba48236f2eff9fc6306a6581cf6eb8c195a7c 100644 (file)
--- 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 989980c714405a38aefaafb7cdea052a97ce1e50..572f4dccf89167f416b49688ccb2fc1b807e1b22 100644 (file)
--- 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 */