From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 16 May 2016 10:21:57 +0000 (+0300)
Subject: Removed buffer_reset().
X-Git-Tag: 2.3.0.rc1~3712
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6d5c9fbdac9af5c4d3f467f828dc6f056309d5e;p=thirdparty%2Fdovecot%2Fcore.git

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 0dbf1cb5f8..206c8fd15d 100644
--- 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 7081f8c0f3..b2607f1362 100644
--- 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 bb35a29fb6..732763ece0 100644
--- 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 1847822735..71db22a4e1 100644
--- 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 aef163595f..65025cb7fe 100644
--- 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 270dc2e642..dfe9e954c4 100644
--- 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 97b23b8250..0b334c5623 100644
--- 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);