X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=src%2FVector.c;h=042e75c561599b30efa64abc48b1ad9e6e5580db;hb=1ff641f9960fa6c6081817a5641afb22fad91dcd;hp=cf45cb97bd6cb53c5e2adb3e512ddf3785ed12cc;hpb=6860e3738006ac605540c4f7bd9b7a8bb75383ac;p=cgds.git diff --git a/src/Vector.c b/src/Vector.c index cf45cb9..042e75c 100644 --- a/src/Vector.c +++ b/src/Vector.c @@ -1,5 +1,5 @@ /** - * @file Vector.cpp + * @file Vector.c */ #include "cgds/Vector.h" @@ -37,7 +37,7 @@ Vector* vector_copy(Vector* vector) return vectorCopy; } -Bool vector_empty(Vector* vector) +bool vector_empty(Vector* vector) { return (vector->size == 0); } @@ -82,23 +82,6 @@ void vector_pop(Vector* vector) _vector_realloc(vector, vector->capacity >> 1); } -void vector_pop_first(Vector* vector) -{ - safe_free(vector->datas[0]); - - - //HACK: next 3 lines move vector head - void** nextDatas = vector->datas + 1; - safe_free(vector->datas); - vector->datas = nextDatas; -//but memory can then be reallocated : TODO - - - vector->size--; - if (vector->size <= (vector->capacity >> 1)) - _vector_realloc(vector, vector->capacity >> 1); -} - void* _vector_get(Vector* vector, UInt index) { return vector->datas[index]; @@ -129,7 +112,8 @@ void vector_destroy(Vector* vector) VectorIterator* vector_get_iterator(Vector* vector) { - VectorIterator* vectorI = (VectorIterator*) safe_malloc(sizeof (VectorIterator)); + VectorIterator* vectorI = + (VectorIterator*) safe_malloc(sizeof (VectorIterator)); vectorI->vector = vector; vectorI_reset_begin(vectorI); return vectorI; @@ -145,7 +129,7 @@ void vectorI_reset_end(VectorIterator* vectorI) vectorI->current = vectorI->vector->datas + vectorI->vector->size - 1; } -Bool vectorI_has_data(VectorIterator* vectorI) +bool vectorI_has_data(VectorIterator* vectorI) { return (vectorI->current >= vectorI->vector->datas && vectorI->current < vectorI->vector->datas + vectorI->vector->size);