From aedd36ac8b1254229c07e280164c477549c2f89f Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Mon, 4 Dec 2017 18:17:52 -0500 Subject: [PATCH] Make sure to include the "*" on function pointer arguments to avoid a warnings from VS2015. See also PR#384. --- json_object.c | 2 +- json_object.h | 2 +- json_visit.c | 6 +++--- json_visit.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/json_object.c b/json_object.c index 8173ece..9daa6fd 100644 --- a/json_object.c +++ b/json_object.c @@ -269,7 +269,7 @@ void json_object_set_userdata(json_object *jso, void *userdata, /* set a custom conversion to string */ void json_object_set_serializer(json_object *jso, - json_object_to_json_string_fn to_string_func, + json_object_to_json_string_fn *to_string_func, void *userdata, json_object_delete_fn *user_delete) { diff --git a/json_object.h b/json_object.h index 215c291..83ce066 100644 --- a/json_object.h +++ b/json_object.h @@ -324,7 +324,7 @@ JSON_EXPORT void json_object_set_userdata(json_object *jso, void *userdata, * @param user_delete an optional function from freeing userdata */ JSON_EXPORT void json_object_set_serializer(json_object *jso, - json_object_to_json_string_fn to_string_func, + json_object_to_json_string_fn *to_string_func, void *userdata, json_object_delete_fn *user_delete); diff --git a/json_visit.c b/json_visit.c index 837ffd2..1126ff8 100644 --- a/json_visit.c +++ b/json_visit.c @@ -15,10 +15,10 @@ static int _json_c_visit(json_object *jso, json_object *parent_jso, const char *jso_key, size_t *jso_index, - json_c_visit_userfunc userfunc, void *userarg); + json_c_visit_userfunc *userfunc, void *userarg); int json_c_visit(json_object *jso, int future_flags, - json_c_visit_userfunc userfunc, void *userarg) + json_c_visit_userfunc *userfunc, void *userarg) { int ret = _json_c_visit(jso, NULL, NULL, NULL, userfunc, userarg); switch(ret) @@ -34,7 +34,7 @@ int json_c_visit(json_object *jso, int future_flags, } static int _json_c_visit(json_object *jso, json_object *parent_jso, const char *jso_key, size_t *jso_index, - json_c_visit_userfunc userfunc, void *userarg) + json_c_visit_userfunc *userfunc, void *userarg) { int userret = userfunc(jso, 0, parent_jso, jso_key, jso_index, userarg); switch(userret) diff --git a/json_visit.h b/json_visit.h index 1d6c68a..2bb5821 100644 --- a/json_visit.h +++ b/json_visit.h @@ -28,7 +28,7 @@ typedef int (json_c_visit_userfunc)(json_object *jso, int flags, * userfunc returned JSON_C_VISIT_RETURN_ERROR. */ int json_c_visit(json_object *jso, int future_flags, - json_c_visit_userfunc userfunc, void *userarg); + json_c_visit_userfunc *userfunc, void *userarg); /** * Passed to json_c_visit_userfunc as one of the flags values to indicate