Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed merge problems

This commit is contained in:
Frank Celler 2012-05-08 09:41:23 +02:00
parent db868d1147
commit a5190bd51e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BasicsC/vector.c
View File

@ -254,13 +254,14 @@ void TRI_InsertVector (TRI_vector_t* vector, void const* element, size_t positio
// ........................................................................... // ...........................................................................
if (vector->_length >= vector->_capacity || position >= vector->_length) { if (vector->_length >= vector->_capacity || position >= vector->_length) {
newSize = (size_t) (1 + GROW_FACTOR * vector->_capacity); newSize = (size_t) (1 + GROW_FACTOR * vector->_capacity);
if (position >= newSize) { if (position >= newSize) {
newSize = position + 1; newSize = position + 1;
} }
newBuffer = (char*) TRI_Allocate(newSize * vector->_elementSize); newBuffer = (char*) TRI_Allocate(vector->_memoryZone, newSize * vector->_elementSize, false);
if (newBuffer == NULL) { if (newBuffer == NULL) {
TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY); TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY);
return; return;
@ -270,7 +271,7 @@ void TRI_InsertVector (TRI_vector_t* vector, void const* element, size_t positio
if (vector->_buffer != NULL) { if (vector->_buffer != NULL) {
memcpy(newBuffer, vector->_buffer, vector->_length * vector->_elementSize); memcpy(newBuffer, vector->_buffer, vector->_length * vector->_elementSize);
TRI_Free(vector->_buffer); TRI_Free(vector->_memoryZone, vector->_buffer);
} }
vector->_buffer = newBuffer; vector->_buffer = newBuffer;
@ -784,13 +785,12 @@ int TRI_PushBackVectorString (TRI_vector_string_t* vector, char* element) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int TRI_InsertVectorString (TRI_vector_string_t* vector, char* element, size_t n) { int TRI_InsertVectorString (TRI_vector_string_t* vector, char* element, size_t n) {
if (n >= vector->_capacity || n >= vector->_length) {
// ........................................................................... // ...........................................................................
// Check and see if we need to extend the vector // Check and see if we need to extend the vector
// ........................................................................... // ...........................................................................
if (n >= vector->_capacity) { if (n >= vector->_capacity || n >= vector->_length) {
char** newBuffer; char** newBuffer;
size_t newSize = (size_t) (1 + GROW_FACTOR * vector->_capacity); size_t newSize = (size_t) (1 + GROW_FACTOR * vector->_capacity);