From 3ec9635b91ede9037261608d3d173e348c7d9bd8 Mon Sep 17 00:00:00 2001 From: Nils Durner Date: Sat, 8 Aug 2009 14:10:24 +0000 Subject: [PATCH] naming --- src/include/gnunet_container_lib.h | 4 ++-- src/util/container_vector.c | 4 ++-- src/util/test_container_vector.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index d0bd9c5a3..59ed430d0 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -790,14 +790,14 @@ void GNUNET_CONTAINER_vector_dump(struct GNUNET_CONTAINER_Vector *v); /** * Allocate a new vector structure with a single empty data segment. */ -struct GNUNET_CONTAINER_Vector * GNUNET_CONTAINER_vector_new(unsigned int vss); +struct GNUNET_CONTAINER_Vector * GNUNET_CONTAINER_vector_create(unsigned int vss); /** * Free vector structure including its data segments, but _not_ including the * stored void pointers. It is the user's responsibility to empty the vector * when necessary to avoid memory leakage. */ -void GNUNET_CONTAINER_vector_free(struct GNUNET_CONTAINER_Vector *v); +void GNUNET_CONTAINER_vector_destroy(struct GNUNET_CONTAINER_Vector *v); /** * Return the size of the vector. diff --git a/src/util/container_vector.c b/src/util/container_vector.c index d9e4fab47..1e3726202 100644 --- a/src/util/container_vector.c +++ b/src/util/container_vector.c @@ -272,7 +272,7 @@ static void vectorFindObject(struct GNUNET_CONTAINER_Vector *v, /** * Allocate a new vector structure with a single empty data segment. */ -struct GNUNET_CONTAINER_Vector * GNUNET_CONTAINER_vector_new(unsigned int vss) { +struct GNUNET_CONTAINER_Vector * GNUNET_CONTAINER_vector_create(unsigned int vss) { struct GNUNET_CONTAINER_Vector *rvalue; if (vss < 2) @@ -296,7 +296,7 @@ struct GNUNET_CONTAINER_Vector * GNUNET_CONTAINER_vector_new(unsigned int vss) { * stored void pointers. It is the user's responsibility to empty the vector * when necessary to avoid memory leakage. */ -void GNUNET_CONTAINER_vector_free(struct GNUNET_CONTAINER_Vector *v) { +void GNUNET_CONTAINER_vector_destroy(struct GNUNET_CONTAINER_Vector *v) { VectorSegment * vs; VectorSegment * vsNext; diff --git a/src/util/test_container_vector.c b/src/util/test_container_vector.c index ddd6cdd3e..580ed5ae0 100644 --- a/src/util/test_container_vector.c +++ b/src/util/test_container_vector.c @@ -30,7 +30,7 @@ static int test(int size) { struct GNUNET_CONTAINER_Vector * v; - v = GNUNET_CONTAINER_vector_new(size); + v = GNUNET_CONTAINER_vector_create(size); if (0 != GNUNET_CONTAINER_vector_size(v)) { DUMP(v); return 1; } if (GNUNET_OK != GNUNET_CONTAINER_vector_insert_at(v, "first", 0)) @@ -76,7 +76,7 @@ static int test(int size) { { DUMP(v); return 1; } if (0 != GNUNET_CONTAINER_vector_size(v)) { DUMP(v); return 1; } - GNUNET_CONTAINER_vector_free(v); + GNUNET_CONTAINER_vector_destroy(v); return 0; } @@ -84,7 +84,7 @@ static int test2(int size) { long i; struct GNUNET_CONTAINER_Vector * v; - v = GNUNET_CONTAINER_vector_new(size); + v = GNUNET_CONTAINER_vector_create(size); for (i=0;i<500;i++) if (GNUNET_OK != GNUNET_CONTAINER_vector_insert_at(v, (void*)i, 0)) @@ -109,16 +109,16 @@ static int test2(int size) { if (i != (long) GNUNET_CONTAINER_vector_get_previous(v)) { DUMP(v); return 1; } - GNUNET_CONTAINER_vector_free(v); + GNUNET_CONTAINER_vector_destroy(v); return 0; } int main(int argc, char * argv[]) { - if (NULL != GNUNET_CONTAINER_vector_new(0)) + if (NULL != GNUNET_CONTAINER_vector_create(0)) { printf("At %d\n", __LINE__); return 1; } - if (NULL != GNUNET_CONTAINER_vector_new(1)) + if (NULL != GNUNET_CONTAINER_vector_create(1)) { printf("At %d\n", __LINE__); return 1; } if (test(2) != 0) { printf("At %d\n", __LINE__); return 1; } -- 2.25.1