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

realloc in stringbuffer instead of malloc

This commit is contained in:
Tim Becker 2012-03-09 15:31:50 +01:00
parent 677d9cfdfb
commit 7b8feddaa4
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
BasicsC/string-buffer.c
View File

@ -55,19 +55,27 @@ static void Reserve (TRI_string_buffer_t * self, size_t size) {
self->_bufferEnd = self->_buffer + size; self->_bufferEnd = self->_buffer + size;
} }
else if ((size_t)(self->_bufferEnd - self->_bufferPtr) < size) { else if ((size_t)(self->_bufferEnd - self->_bufferPtr) < size) {
size_t newlen; size_t newlen, offset;
char * b; //char * b;
//printf(">b: %zx , bp: %zx , be:%zx \n", self->_buffer, self->_bufferPtr, self->_bufferEnd);
newlen = (size_t)(1.2 * ((self->_bufferEnd - self->_buffer) + size)); newlen = (size_t)(1.2 * ((self->_bufferEnd - self->_buffer) + size));
b = TRI_Allocate(newlen + 1); // b = TRI_Allocate(newlen + 1);
offset = (self->_bufferPtr - self->_buffer);
self->_buffer=TRI_Reallocate(self->_buffer,newlen +1);
self->_bufferPtr = self->_buffer+offset;
self->_bufferEnd = self->_buffer+newlen;
memcpy(b, self->_buffer, self->_bufferEnd - self->_buffer + 1); //printf("<b: %zx , bp: %zx , be:%zx nl:%d \n", self->_buffer, self->_bufferPtr, self->_bufferEnd, newlen);
//
TRI_Free(self->_buffer); // memcpy(b, self->_buffer, self->_bufferEnd - self->_buffer + 1);
//
self->_bufferPtr = b + (self->_bufferPtr - self->_buffer); // TRI_Free(self->_buffer);
self->_bufferEnd = b + newlen; //
self->_buffer = b; // self->_bufferPtr = b + (self->_bufferPtr - self->_buffer);
// self->_bufferEnd = b + newlen;
// self->_buffer = b;
} }
} }