summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2015-03-04 03:10:10 +0000
committerEric Haszlakiewicz <erh+git@nimenees.com>2015-03-04 03:10:10 +0000
commit484ca368f07054cde67cea5a5fa43ce3b049e667 (patch)
treef7bd4750fa5656a162d127f8ca9b7401da9059cf
parenta500c1f0b5da18a4108e1844fc50fc2ed4c75a86 (diff)
Slight style tweaks to the bsearch changest.
-rw-r--r--arraylist.c8
-rw-r--r--arraylist.h4
-rw-r--r--json_object.c12
-rw-r--r--json_object.h2
4 files changed, 12 insertions, 14 deletions
diff --git a/arraylist.c b/arraylist.c
index 5ccbdd2..8efe006 100644
--- a/arraylist.c
+++ b/arraylist.c
@@ -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);
}
-void* array_list_bsearch( const void **key, struct array_list *arr,
- int (*sort_fn)(const void *, const void *) )
+void* array_list_bsearch(const void **key, struct array_list *arr,
+ int (*sort_fn)(const void *, const void *))
{
- return bsearch( key, arr->array, arr->length, sizeof(arr->array[0]),
- sort_fn );
+ return bsearch(key, arr->array, arr->length, sizeof(arr->array[0]),
+ sort_fn);
}
int
diff --git a/arraylist.h b/arraylist.h
index 50fb320..caecdfa 100644
--- a/arraylist.h
+++ b/arraylist.h
@@ -49,9 +49,9 @@ array_list_length(struct array_list *al);
extern 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,
- int (*sort_fn)(const void *, const void *) );
+ int (*sort_fn)(const void *, const void *));
#ifdef __cplusplus
diff --git a/json_object.c b/json_object.c
index c858a9e..9b89bb7 100644
--- a/json_object.c
+++ b/json_object.c
@@ -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(
const struct json_object *key,
const struct json_object *jso,
- int (*sort_fn)(const void *, const void *) )
+ int (*sort_fn)(const void *, const void *))
{
struct json_object **result;
- result = (struct json_object **) array_list_bsearch(
- (const void **) &key, jso->o.c_array, sort_fn );
+ result = (struct json_object **)array_list_bsearch(
+ (const void **)&key, jso->o.c_array, sort_fn);
- if ( result == NULL ) {
+ if (!result)
return NULL;
- } else {
- return *result;
- }
+ return *result;
}
int json_object_array_length(struct json_object *jso)
diff --git a/json_object.h b/json_object.h
index e1858aa..2bdfd5f 100644
--- a/json_object.h
+++ b/json_object.h
@@ -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(
const struct json_object *key,
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
*