From: max Date: Fri, 1 Jun 2018 15:21:06 +0000 (+0300) Subject: arraylist: Fix names of parameters for callback function X-Git-Tag: json-c-0.14-20200419~123^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F420%2Fhead;p=thirdparty%2Fjson-c.git arraylist: Fix names of parameters for callback function --- diff --git a/arraylist.c b/arraylist.c index ddeb8d4e..8a88ed16 100644 --- a/arraylist.c +++ b/arraylist.c @@ -112,16 +112,16 @@ array_list_add(struct array_list *arr, void *data) } void -array_list_sort(struct array_list *arr, int(*sort_fn)(const void *, const void *)) +array_list_sort(struct array_list *arr, int(*compar)(const void *, const void *)) { - qsort(arr->array, arr->length, sizeof(arr->array[0]), sort_fn); + qsort(arr->array, arr->length, sizeof(arr->array[0]), compar); } void* array_list_bsearch(const void **key, struct array_list *arr, - int (*sort_fn)(const void *, const void *)) + int (*compar)(const void *, const void *)) { return bsearch(key, arr->array, arr->length, sizeof(arr->array[0]), - sort_fn); + compar); } size_t diff --git a/arraylist.h b/arraylist.h index 38603e8a..a0d767ea 100644 --- a/arraylist.h +++ b/arraylist.h @@ -56,9 +56,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, - struct array_list *arr, - int (*sort_fn)(const void *, const void *)); +extern void* +array_list_bsearch(const void **key, struct array_list *arr, + int (*compar)(const void *, const void *)); extern int array_list_del_idx(struct array_list *arr, size_t idx, size_t count);