indent pass MODAPP-202

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11335 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2009-01-21 19:31:45 +00:00
1 parent d88a0fbefc
commit af82478311
20 files changed
+2029 -1979

No files matched your search

+47 -45
View File
@@ -23,71 +23,73 @@
#include "bits.h"
#include "arraylist.h"
struct array_list*
array_list_new(array_list_free_fn *free_fn)
struct array_list *array_list_new(array_list_free_fn * free_fn)
{
struct array_list *this;
struct array_list *this;
if(!(this = calloc(1, sizeof(struct array_list)))) return NULL;
this->size = ARRAY_LIST_DEFAULT_SIZE;
this->length = 0;
this->free_fn = free_fn;
if(!(this->array = calloc(sizeof(void*), this->size))) {
free(this);
return NULL;
}
return this;
if (!(this = calloc(1, sizeof(struct array_list))))
return NULL;
this->size = ARRAY_LIST_DEFAULT_SIZE;
this->length = 0;
this->free_fn = free_fn;
if (!(this->array = calloc(sizeof(void *), this->size))) {
free(this);
return NULL;
}
return this;
}
extern void
array_list_free(struct array_list *this)
extern void array_list_free(struct array_list *this)
{
int i;
for(i = 0; i < this->length; i++)
if(this->array[i]) this->free_fn(this->array[i]);
free(this->array);
free(this);
int i;
for (i = 0; i < this->length; i++)
if (this->array[i])
this->free_fn(this->array[i]);
free(this->array);
free(this);
}
void*
array_list_get_idx(struct array_list *this, int i)
void *array_list_get_idx(struct array_list *this, int i)
{
if(i >= this->length) return NULL;
return this->array[i];
if (i >= this->length)
return NULL;
return this->array[i];
}
static int array_list_expand_internal(struct array_list *this, int max)
{
void *t;
int new_size;
void *t;
int new_size;
if(max < this->size) return 0;
new_size = max(this->size << 1, max);
if(!(t = realloc(this->array, new_size*sizeof(void*)))) return -1;
this->array = t;
(void)memset(this->array + this->size, 0, (new_size-this->size)*sizeof(void*));
this->size = new_size;
return 0;
if (max < this->size)
return 0;
new_size = max(this->size << 1, max);
if (!(t = realloc(this->array, new_size * sizeof(void *))))
return -1;
this->array = t;
(void) memset(this->array + this->size, 0, (new_size - this->size) * sizeof(void *));
this->size = new_size;
return 0;
}
int
array_list_put_idx(struct array_list *this, int idx, void *data)
int array_list_put_idx(struct array_list *this, int idx, void *data)
{
if(array_list_expand_internal(this, idx)) return -1;
if(this->array[idx]) this->free_fn(this->array[idx]);
this->array[idx] = data;
if(this->length <= idx) this->length = idx + 1;
return 0;
if (array_list_expand_internal(this, idx))
return -1;
if (this->array[idx])
this->free_fn(this->array[idx]);
this->array[idx] = data;
if (this->length <= idx)
this->length = idx + 1;
return 0;
}
int
array_list_add(struct array_list *this, void *data)
int array_list_add(struct array_list *this, void *data)
{
return array_list_put_idx(this, this->length, data);
return array_list_put_idx(this, this->length, data);
}
int
array_list_length(struct array_list *this)
int array_list_length(struct array_list *this)
{
return this->length;
return this->length;
}