diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-04-15 12:20:14 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-04-15 12:20:14 -0400 |
commit | 12e26a6e7691d1c7dddfe07c8a72ffac6d586707 (patch) | |
tree | fc48ad2d24e2c955229a10bc10533776cebdfc00 /src/or/buffers.c | |
parent | 8c6b528b00a82f6fd027d543ba8257dfa2fc97ef (diff) | |
download | tor-12e26a6e7691d1c7dddfe07c8a72ffac6d586707.tar.gz tor-12e26a6e7691d1c7dddfe07c8a72ffac6d586707.zip |
Disambiguate: Avoid defining two static functions called chunk_free_unchecked
Diffstat (limited to 'src/or/buffers.c')
-rw-r--r-- | src/or/buffers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index f93cc48f33..cdc71ab9db 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -107,7 +107,7 @@ chunk_repack(chunk_t *chunk) /** Keep track of total size of allocated chunks for consistency asserts */ static size_t total_bytes_allocated_in_chunks = 0; static void -chunk_free_unchecked(chunk_t *chunk) +buf_chunk_free_unchecked(chunk_t *chunk) { if (!chunk) return; @@ -228,7 +228,7 @@ buf_pullup(buf_t *buf, size_t bytes) dest->next = src->next; if (buf->tail == src) buf->tail = dest; - chunk_free_unchecked(src); + buf_chunk_free_unchecked(src); } else { memcpy(CHUNK_WRITE_PTR(dest), src->data, n); dest->datalen += n; @@ -274,7 +274,7 @@ buf_remove_from_front(buf_t *buf, size_t n) buf->head = victim->next; if (buf->tail == victim) buf->tail = NULL; - chunk_free_unchecked(victim); + buf_chunk_free_unchecked(victim); } } check(); @@ -314,7 +314,7 @@ buf_clear(buf_t *buf) buf->datalen = 0; for (chunk = buf->head; chunk; chunk = next) { next = chunk->next; - chunk_free_unchecked(chunk); + buf_chunk_free_unchecked(chunk); } buf->head = buf->tail = NULL; } |