github-code/json-c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight style tweaks to the bsearch changest.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2015-03-04 03:10:10 +00:00
parent a500c1f0b5
commit 484ca368f0
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arraylist.c
View File

@@ -94,11 +94,11 @@ array_list_sort(struct array_list *arr, int(*sort_fn)(const void *, const void *
qsort(arr->array, arr->length, sizeof(arr->array[0]), sort_fn); qsort(arr->array, arr->length, sizeof(arr->array[0]), sort_fn);
} }
void* array_list_bsearch( const void **key, struct array_list *arr, void* array_list_bsearch(const void **key, struct array_list *arr,
int (*sort_fn)(const void *, const void *) ) int (*sort_fn)(const void *, const void *))
{ {
return bsearch( key, arr->array, arr->length, sizeof(arr->array[0]), return bsearch(key, arr->array, arr->length, sizeof(arr->array[0]),
sort_fn ); sort_fn);
} }
int int

4
arraylist.h
View File

@@ -49,9 +49,9 @@ array_list_length(struct array_list *al);
extern void extern void
array_list_sort(struct array_list *arr, int(*compar)(const void *, const void *)); array_list_sort(struct array_list *arr, int(*compar)(const void *, const void *));
extern void* array_list_bsearch( const void **key, extern void* array_list_bsearch(const void **key,
struct array_list *arr, struct array_list *arr,
int (*sort_fn)(const void *, const void *) ); int (*sort_fn)(const void *, const void *));
#ifdef __cplusplus #ifdef __cplusplus

12
json_object.c
View File

@@ -892,18 +892,16 @@ void json_object_array_sort(struct json_object *jso, int(*sort_fn)(const void *,
struct json_object* json_object_array_bsearch( struct json_object* json_object_array_bsearch(
const struct json_object *key, const struct json_object *key,
const struct json_object *jso, const struct json_object *jso,
int (*sort_fn)(const void *, const void *) ) int (*sort_fn)(const void *, const void *))
{ {
struct json_object **result; struct json_object **result;
result = (struct json_object **) array_list_bsearch( result = (struct json_object **)array_list_bsearch(
(const void **) &key, jso->o.c_array, sort_fn ); (const void **)&key, jso->o.c_array, sort_fn);
if ( result == NULL ) { if (!result)
return NULL; return NULL;
} else { return *result;
return *result;
}
} }
int json_object_array_length(struct json_object *jso) int json_object_array_length(struct json_object *jso)

2
json_object.h
View File

@@ -424,7 +424,7 @@ extern void json_object_array_sort(struct json_object *jso, int(*sort_fn)(const
extern struct json_object* json_object_array_bsearch( extern struct json_object* json_object_array_bsearch(
const struct json_object *key, const struct json_object *key,
const struct json_object *jso, const struct json_object *jso,
int (*sort_fn)(const void *, const void *) ); int (*sort_fn)(const void *, const void *));
/** Add an element to the end of a json_object of type json_type_array /** Add an element to the end of a json_object of type json_type_array
* *