Browse Source

Merge pull request #420 from angelskieglazki/master

arraylist: Fixed names of parameters for callback function
tags/json-c-0.14-20200419
Eric Haszlakiewicz GitHub 7 years ago
parent
commit
4bbc72f633
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
  1. +4
    -4
      arraylist.c
  2. +3
    -3
      arraylist.h

+ 4
- 4
arraylist.c View File

@@ -112,16 +112,16 @@ array_list_add(struct array_list *arr, void *data)
} }


void 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, 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]), return bsearch(key, arr->array, arr->length, sizeof(arr->array[0]),
sort_fn);
compar);
} }


size_t size_t


+ 3
- 3
arraylist.h View File

@@ -56,9 +56,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,
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 extern int
array_list_del_idx(struct array_list *arr, size_t idx, size_t count); array_list_del_idx(struct array_list *arr, size_t idx, size_t count);


Loading…
Cancel
Save