naming

diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index d0bd9c5a35f64cc301e963dc611f30980a1e414c..59ed430d01b92e325e323bab1bb35146962952a2 100644 (file)
--- 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 d9e4fab470de8ab545aad0568ab1e88381257359..1e3726202b249758e0a1c91cb2218e024b0ea4ec 100644 (file)
--- 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 ddd6cdd3efdac7db668ca428274a50ff40353d77..580ed5ae040f5e239070ad0104a3eadf3dc503a1 100644 (file)
--- 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; }