Skip to content

M
mongoose
Commit c5287b90 authored by Sergey Lyubka's avatar Sergey Lyubka
Browse files
Options

iobuf_append() refactored: allocating exactly as many bytes as needed

parent 223f6d96
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
mongoose.c
View file @ c5287b90
...@@ -266,10 +266,6 @@ int ns_hexdump(const void *buf, int len, char *dst, int dst_len); ...@@ -266,10 +266,6 @@ int ns_hexdump(const void *buf, int len, char *dst, int dst_len);
#define NS_FREE free #define NS_FREE free
#endif #endif
#ifndef IOBUF_RESIZE_MULTIPLIER
#define IOBUF_RESIZE_MULTIPLIER 2.0
#endif
void iobuf_init(struct iobuf *iobuf, size_t size) { void iobuf_init(struct iobuf *iobuf, size_t size) {
iobuf->len = iobuf->size = 0; iobuf->len = iobuf->size = 0;
iobuf->buf = NULL; iobuf->buf = NULL;
...@@ -288,19 +284,18 @@ void iobuf_free(struct iobuf *iobuf) { ...@@ -288,19 +284,18 @@ void iobuf_free(struct iobuf *iobuf) {
size_t iobuf_append(struct iobuf *io, const void *buf, size_t len) { size_t iobuf_append(struct iobuf *io, const void *buf, size_t len) {
char *p = NULL; char *p = NULL;
size_t new_len = io->len + len, new_size = new_len * IOBUF_RESIZE_MULTIPLIER;
assert(io->len <= io->size); assert(io->len <= io->size);
if (len <= 0) { if (len <= 0) {
} else if (new_len < io->size) { } else if (io->len + len <= io->size) {
memcpy(io->buf + io->len, buf, len); memcpy(io->buf + io->len, buf, len);
io->len = new_len; io->len += len;
} else if ((p = (char *) NS_REALLOC(io->buf, new_size)) != NULL) { } else if ((p = (char *) NS_REALLOC(io->buf, io->len + len)) != NULL) {
io->buf = p; io->buf = p;
memcpy(io->buf + io->len, buf, len); memcpy(io->buf + io->len, buf, len);
io->len = new_len; io->len += len;
io->size = new_size; io->size = io->len;
} else { } else {
len = 0; len = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment