Slight style tweaks to the bsearch changest.

diff --git a/arraylist.c b/arraylist.c
index 5ccbdd22934af7e3b76264cd0a071c1cca408540..8efe006eb6de4ac7ccddeb21840481793029876f 100644 (file)
--- 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 50fb32070ab4e7a5da00078f6aa9b921ec02679b..caecdfa5c3a95e91a272b4a3c536c3475d62cbcb 100644 (file)
--- 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 c858a9efe5f34a21166f3389be3f56bb4819ac5c..9b89bb7673ac2798cbb2a33bfc319214d03203f1 100644 (file)
--- 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 e1858aac69cb123b6e0914d72aeae327fc3a1520..2bdfd5f9d6851c00ec72f92a1230f4dfb8f6edf9 100644 (file)
--- 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
  *