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

Merge pull request #563 from robybeen/master

Browse Source 
Changed order of calloc args to match stdlib
This commit is contained in:
Eric Haszlakiewicz
2020-04-02 22:35:21 -04:00
committed by GitHub
parent 6afcf1606b 5d9b8e0fef
commit ed54353d84
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arraylist.c
View File

@@ -46,7 +46,7 @@ array_list_new(array_list_free_fn *free_fn)
arr->size = ARRAY_LIST_DEFAULT_SIZE; arr->size = ARRAY_LIST_DEFAULT_SIZE;
arr->length = 0; arr->length = 0;
arr->free_fn = free_fn; arr->free_fn = free_fn;
if(!(arr->array = (void**)calloc(sizeof(void*), arr->size))) { if(!(arr->array = (void**)calloc(arr->size, sizeof(void*)))) {
free(arr); free(arr);
return NULL; return NULL;
} }

2
json_object.c
View File

@@ -228,7 +228,7 @@ static struct json_object* json_object_new(enum json_type o_type)
{ {
struct json_object *jso; struct json_object *jso;
jso = (struct json_object*)calloc(sizeof(struct json_object), 1); jso = (struct json_object*)calloc(1, sizeof(struct json_object));
if (!jso) if (!jso)
return NULL; return NULL;
jso->o_type = o_type; jso->o_type = o_type;