Removed buffer_reset().

It was just a wrapper to buffer_set_used_size() and its comment was a bit
confusing (or obsolete), since it wasn't actually immediately zeroing out
the buffer.

diff --git a/src/lib-index/mail-cache-lookup.c b/src/lib-index/mail-cache-lookup.c
index 0dbf1cb5f8f6fe8ded72a193aedd7c638a8469c8..206c8fd15d0694ee0d6e5e6f839e62533358ebec 100644 (file)
--- a/src/lib-index/mail-cache-lookup.c
+++ b/src/lib-index/mail-cache-lookup.c
@@ -313,7 +313,7 @@ static int mail_cache_seq(struct mail_cache_view *view, uint32_t seq)
 
        if (++view->cached_exists_value == 0) {
                /* wrapped, we'll have to clear the buffer */
-               buffer_reset(view->cached_exists_buf);
+               buffer_set_used_size(view->cached_exists_buf, 0);
                view->cached_exists_value++;
        }
        view->cached_exists_seq = seq;

diff --git a/src/lib-index/mail-index-map-read.c b/src/lib-index/mail-index-map-read.c
index 7081f8c0f364d3b7317bf9b4fefd385a9288c9d6..b2607f136291196191c47b2749be6e22b1adb86b 100644 (file)
--- a/src/lib-index/mail-index-map-read.c
+++ b/src/lib-index/mail-index-map-read.c
@@ -162,7 +162,7 @@ mail_index_try_read_map(struct mail_index_map *map,
                        pos = hdr->header_size;
 
                /* place the base header into memory. */
-               buffer_reset(map->hdr_copy_buf);
+               buffer_set_used_size(map->hdr_copy_buf, 0);
                buffer_append(map->hdr_copy_buf, buf, pos);
 
                if (pos != hdr->header_size) {

diff --git a/src/lib-index/mail-index-sync-update.c b/src/lib-index/mail-index-sync-update.c
index bb35a29fb69b49d6cca0fa06fe18fcc59689f2e0..732763ece051d21b0512a72f5227026126b14700 100644 (file)
--- a/src/lib-index/mail-index-sync-update.c
+++ b/src/lib-index/mail-index-sync-update.c
@@ -990,7 +990,7 @@ int mail_index_sync_map(struct mail_index_map **_map,
                   and updates hdr_base to hdr_copy_buf. so the buffer must
                   initially contain a valid header or we'll break it when
                   writing it. */
-               buffer_reset(map->hdr_copy_buf);
+               buffer_set_used_size(map->hdr_copy_buf, 0);
                buffer_append(map->hdr_copy_buf, map->hdr_base,
                              map->hdr.header_size);
                map->hdr_base = map->hdr_copy_buf->data;

diff --git a/src/lib-mail/istream-header-filter.c b/src/lib-mail/istream-header-filter.c
index 184782273586706c78760c140f8d97a3668acb6b..71db22a4e177f4d3ed938def4303f466946a5975 100644 (file)
--- a/src/lib-mail/istream-header-filter.c
+++ b/src/lib-mail/istream-header-filter.c
@@ -383,7 +383,7 @@ handle_end_body_with_lf(struct header_filter_istream *mstream, ssize_t ret)
                i_assert(!mstream->last_lf_added);
                i_assert(size == 0 || data[size-1] != '\n');
 
-               buffer_reset(mstream->hdr_buf);
+               buffer_set_used_size(mstream->hdr_buf, 0);
                buffer_append(mstream->hdr_buf, data, size);
                if (mstream->crlf)
                        buffer_append_c(mstream->hdr_buf, '\r');

diff --git a/src/lib/buffer.c b/src/lib/buffer.c
index aef163595f47a788c741569807f7d200227d9944..65025cb7fe2c386fb25a73a35dca2380104919b9 100644 (file)
--- a/src/lib/buffer.c
+++ b/src/lib/buffer.c
@@ -174,11 +174,6 @@ pool_t buffer_get_pool(const buffer_t *_buf)
        return buf->pool;
 }
 
-void buffer_reset(buffer_t *buf)
-{
-       buffer_set_used_size(buf, 0);
-}
-
 void buffer_write(buffer_t *_buf, size_t pos,
                  const void *data, size_t data_size)
 {

diff --git a/src/lib/buffer.h b/src/lib/buffer.h
index 270dc2e64269957c228cc0dd5d60f78a37713446..dfe9e954c405813b39651646cc2dcd8295f14db7 100644 (file)
--- a/src/lib/buffer.h
+++ b/src/lib/buffer.h
@@ -39,9 +39,6 @@ void *buffer_free_without_data(buffer_t **buf);
 /* Returns the pool buffer was created with. */
 pool_t buffer_get_pool(const buffer_t *buf) ATTR_PURE;
 
-/* Reset the buffer. used size and it's contents are zeroed. */
-void buffer_reset(buffer_t *buf);
-
 /* Write data to buffer at specified position. */
 void buffer_write(buffer_t *buf, size_t pos,
                  const void *data, size_t data_size);

diff --git a/src/lib/test-pkcs5.c b/src/lib/test-pkcs5.c
index 97b23b825013bab189bb6fa1c240d5835ceb139a..0b334c56238ef6f6d90a71e21db5a9b6ee66b0ef 100644 (file)
--- a/src/lib/test-pkcs5.c
+++ b/src/lib/test-pkcs5.c
@@ -37,7 +37,7 @@ void test_pkcs5_pbkdf2(void)
        test_begin("pkcs5_pbkdf2");
 
        for(size_t i = 0; i < N_ELEMENTS(test_vectors_v2); i++) {
-               buffer_reset(res);
+               buffer_set_used_size(res, 0);
                const struct test_vector *vec = &(test_vectors_v2[i]);
                pkcs5_pbkdf(PKCS5_PBKDF2, hash_method_lookup(vec->prf), vec->p, vec->pLen, vec->s, vec->sLen, vec->i, vec->dkLen, res);
                test_assert_idx(memcmp(res->data, vec->dk, vec->dkLen) == 0, i);