mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-10 15:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #384 from ssrlive/patch-1

Browse Source 
Fix a VS 2015 compiler warning.
This commit is contained in:
Eric Haszlakiewicz
2017-12-04 18:11:09 -05:00
committed by GitHub
parent b34d26ff25 2643658b6f
commit 95015d474e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
json_object.c
View File

@@ -1374,7 +1374,7 @@ int json_c_shallow_copy_default(json_object *src, json_object *parent, const cha
* *
* Note: caller is responsible for freeing *dst if this fails and returns -1. * Note: caller is responsible for freeing *dst if this fails and returns -1.
*/ */
static int json_object_deep_copy_recursive(struct json_object *src, struct json_object *parent, const char *key_in_parent, size_t index_in_parent, struct json_object **dst, json_c_shallow_copy_fn shallow_copy) static int json_object_deep_copy_recursive(struct json_object *src, struct json_object *parent, const char *key_in_parent, size_t index_in_parent, struct json_object **dst, json_c_shallow_copy_fn *shallow_copy)
{ {
struct json_object_iter iter; struct json_object_iter iter;
size_t src_array_len, ii; size_t src_array_len, ii;
@@ -1443,7 +1443,7 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_
return 0; return 0;
} }
int json_object_deep_copy(struct json_object *src, struct json_object **dst, json_c_shallow_copy_fn shallow_copy) int json_object_deep_copy(struct json_object *src, struct json_object **dst, json_c_shallow_copy_fn *shallow_copy)
{ {
int rc; int rc;

2
json_object.h
View File

@@ -1009,7 +1009,7 @@ json_c_shallow_copy_fn json_c_shallow_copy_default;
* or if the destination pointer is non-NULL * or if the destination pointer is non-NULL
*/ */
JSON_EXPORT int json_object_deep_copy(struct json_object *src, struct json_object **dst, json_c_shallow_copy_fn shallow_copy); JSON_EXPORT int json_object_deep_copy(struct json_object *src, struct json_object **dst, json_c_shallow_copy_fn *shallow_copy);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif