summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2018-06-02 23:01:04 -0400
committerGitHub <noreply@github.com>2018-06-02 23:01:04 -0400
commit4bbc72f6337b87a8c19b1dd5a8e416056d6dfbd1 (patch)
tree4e50aa4dd33b9a5ad5325b7ec917efe0a03cb1ac
parent4414d068b308bff4fd98c83e1ae08346913f93c4 (diff)
parent7a4759f16509a734c6db9bb01677d534da00d455 (diff)
downloadjson-c-4bbc72f6337b87a8c19b1dd5a8e416056d6dfbd1.tar.gz
Merge pull request #420 from angelskieglazki/master
arraylist: Fixed names of parameters for callback function
-rw-r--r--arraylist.c8
-rw-r--r--arraylist.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/arraylist.c b/arraylist.c
index ddeb8d4..8a88ed1 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 38603e8..a0d767e 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);