mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-07 06:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use size_t for array list length and size

Browse Source
This commit is contained in:
Daniel M. Weeks
2014-08-22 10:56:59 -04:00
parent c97bbd3797
commit 45c56b80c4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arraylist.c
View File

@@ -42,7 +42,7 @@ array_list_new(array_list_free_fn *free_fn)
extern void extern void
array_list_free(struct array_list *arr) array_list_free(struct array_list *arr)
{ {
int i; size_t i;
for(i = 0; i < arr->length; i++) for(i = 0; i < arr->length; i++)
if(arr->array[i]) arr->free_fn(arr->array[i]); if(arr->array[i]) arr->free_fn(arr->array[i]);
free(arr->array); free(arr->array);
@@ -50,16 +50,16 @@ array_list_free(struct array_list *arr)
} }
void* void*
array_list_get_idx(struct array_list *arr, int i) array_list_get_idx(struct array_list *arr, size_t i)
{ {
if(i >= arr->length) return NULL; if(i >= arr->length) return NULL;
return arr->array[i]; return arr->array[i];
} }
static int array_list_expand_internal(struct array_list *arr, int max) static int array_list_expand_internal(struct array_list *arr, size_t max)
{ {
void *t; void *t;
int new_size; size_t new_size;
if(max < arr->size) return 0; if(max < arr->size) return 0;
new_size = arr->size << 1; new_size = arr->size << 1;
@@ -73,7 +73,7 @@ static int array_list_expand_internal(struct array_list *arr, int max)
} }
int int
array_list_put_idx(struct array_list *arr, int idx, void *data) array_list_put_idx(struct array_list *arr, size_t idx, void *data)
{ {
if(array_list_expand_internal(arr, idx+1)) return -1; if(array_list_expand_internal(arr, idx+1)) return -1;
if(arr->array[idx]) arr->free_fn(arr->array[idx]); if(arr->array[idx]) arr->free_fn(arr->array[idx]);
@@ -101,7 +101,7 @@ void* array_list_bsearch(const void **key, struct array_list *arr,
sort_fn); sort_fn);
} }
int size_t
array_list_length(struct array_list *arr) array_list_length(struct array_list *arr)
{ {
return arr->length; return arr->length;

10
arraylist.h
View File

@@ -23,8 +23,8 @@ typedef void (array_list_free_fn) (void *data);
struct array_list struct array_list
{ {
void **array; void **array;
int length; size_t length;
int size; size_t size;
array_list_free_fn *free_fn; array_list_free_fn *free_fn;
}; };
@@ -35,15 +35,15 @@ extern void
array_list_free(struct array_list *al); array_list_free(struct array_list *al);
extern void* extern void*
array_list_get_idx(struct array_list *al, int i); array_list_get_idx(struct array_list *al, size_t i);
extern int extern int
array_list_put_idx(struct array_list *al, int i, void *data); array_list_put_idx(struct array_list *al, size_t i, void *data);
extern int extern int
array_list_add(struct array_list *al, void *data); array_list_add(struct array_list *al, void *data);
extern int extern size_t
array_list_length(struct array_list *al); array_list_length(struct array_list *al);
extern void extern void