Skip to content

Commit 7454162

Browse files
awitten1Andrew Witten
authored andcommitted
CDRIVER-3672 removed superflous memmove calls
Co-authored-by: Andrew Witten <[email protected]>
1 parent 91d0016 commit 7454162

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

src/libmongoc/src/mongoc/mongoc-buffer.c

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,10 @@ _mongoc_buffer_append (mongoc_buffer_t *buffer,
136136
BSON_ASSERT (buffer->datalen);
137137

138138
if (!SPACE_FOR (buffer, data_size)) {
139-
if (buffer->len) {
140-
memmove (&buffer->data[0], buffer->data, buffer->len);
141-
}
142-
143-
if (!SPACE_FOR (buffer, data_size)) {
144-
BSON_ASSERT ((buffer->datalen + data_size) < INT_MAX);
145-
buffer->datalen = bson_next_power_of_two (data_size + buffer->len);
146-
buffer->data = (uint8_t *) buffer->realloc_func (
147-
buffer->data, buffer->datalen, NULL);
148-
}
139+
BSON_ASSERT ((buffer->datalen + data_size) < INT_MAX);
140+
buffer->datalen = bson_next_power_of_two (data_size + buffer->len);
141+
buffer->data =
142+
(uint8_t *) buffer->realloc_func (buffer->data, buffer->datalen, NULL);
149143
}
150144

151145
buf = &buffer->data[buffer->len];
@@ -193,16 +187,10 @@ _mongoc_buffer_append_from_stream (mongoc_buffer_t *buffer,
193187
BSON_ASSERT (buffer->datalen);
194188

195189
if (!SPACE_FOR (buffer, size)) {
196-
if (buffer->len) {
197-
memmove (&buffer->data[0], buffer->data, buffer->len);
198-
}
199-
200-
if (!SPACE_FOR (buffer, size)) {
201-
BSON_ASSERT ((buffer->datalen + size) < INT_MAX);
202-
buffer->datalen = bson_next_power_of_two (size + buffer->len);
203-
buffer->data = (uint8_t *) buffer->realloc_func (
204-
buffer->data, buffer->datalen, NULL);
205-
}
190+
BSON_ASSERT ((buffer->datalen + size) < INT_MAX);
191+
buffer->datalen = bson_next_power_of_two (size + buffer->len);
192+
buffer->data =
193+
(uint8_t *) buffer->realloc_func (buffer->data, buffer->datalen, NULL);
206194
}
207195

208196
buf = &buffer->data[buffer->len];
@@ -261,10 +249,6 @@ _mongoc_buffer_fill (mongoc_buffer_t *buffer,
261249

262250
min_bytes -= buffer->len;
263251

264-
if (buffer->len) {
265-
memmove (&buffer->data[0], buffer->data, buffer->len);
266-
}
267-
268252
if (!SPACE_FOR (buffer, min_bytes)) {
269253
buffer->datalen = bson_next_power_of_two (buffer->len + min_bytes);
270254
buffer->data = (uint8_t *) buffer->realloc_func (

0 commit comments

Comments
 (0)