X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-buffer.c;fp=src%2Fcommon%2Fdynamic-buffer.c;h=4f1116213a55dce6ec54be42efec2519f35a280e;hp=05d3022af19d0e4e8ef9d0527a6069394131eb6b;hb=63557623eba8b58076e0454731a2d52e2ac5966b;hpb=df94ef0f8c4b890d961e5e69b9945035de03a05b diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c index 05d3022af..4f1116213 100644 --- a/src/common/dynamic-buffer.c +++ b/src/common/dynamic-buffer.c @@ -59,11 +59,11 @@ int lttng_dynamic_buffer_append(struct lttng_dynamic_buffer *buffer, goto end; } - assert(buffer->capacity >= buffer->size); - if (buffer->capacity < (len + buffer->size)) { + assert(buffer->_capacity >= buffer->size); + if (buffer->_capacity < (len + buffer->size)) { ret = lttng_dynamic_buffer_set_capacity(buffer, - buffer->capacity + - (len - (buffer->capacity - buffer->size))); + buffer->_capacity + + (len - (buffer->_capacity - buffer->size))); if (ret) { goto end; } @@ -104,9 +104,9 @@ int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer, goto end; } - if (new_size > buffer->capacity) { + if (new_size > buffer->_capacity) { size_t original_size = buffer->size; - size_t original_capacity = buffer->capacity; + size_t original_capacity = buffer->_capacity; ret = lttng_dynamic_buffer_set_capacity(buffer, new_size); if (ret) { @@ -155,7 +155,7 @@ int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer, goto end; } - if (new_capacity == buffer->capacity) { + if (new_capacity == buffer->_capacity) { goto end; } @@ -166,7 +166,7 @@ int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer, goto end; } buffer->data = new_buf; - buffer->capacity = new_capacity; + buffer->_capacity = new_capacity; end: return ret; } @@ -178,6 +178,6 @@ void lttng_dynamic_buffer_reset(struct lttng_dynamic_buffer *buffer) return; } buffer->size = 0; - buffer->capacity = 0; + buffer->_capacity = 0; free(buffer->data); }