dovecot-2.2: Renamed buffer_create_*data() to buffer_create_from...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Sep 6 01:13:41 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/7efef678bca8
changeset: 15034:7efef678bca8
user: Timo Sirainen <tss at iki.fi>
date: Thu Sep 06 01:13:03 2012 +0300
description:
Renamed buffer_create_*data() to buffer_create_from_*data() for consistency.
Especially i_stream_create_from_data() was a very similar function, which
made it difficult to remember which one should have "from" and which one
shouldn't.
diffstat:
src/auth/auth-master-connection.c | 2 +-
src/auth/mech-digest-md5.c | 2 +-
src/imap/main.c | 4 ++--
src/lib-index/mail-index-modseq.c | 6 +++---
src/lib-index/mail-index-sync-keywords.c | 4 ++--
src/lib-index/mail-index-transaction-export.c | 2 +-
src/lib-index/mail-transaction-log-append.c | 2 +-
src/lib-index/mail-transaction-log-file.c | 4 ++--
src/lib-index/mail-transaction-log-view.c | 8 ++++----
src/lib-mail/istream-binary-converter.c | 4 ++--
src/lib-mail/istream-qp-decoder.c | 3 ++-
src/lib-mail/test-message-header-encode.c | 2 +-
src/lib-otp/otp-parse.c | 4 ++--
src/lib-storage/index/index-mail.c | 2 +-
src/lib-storage/index/maildir/maildir-save.c | 6 +++---
src/lib-storage/mail.c | 2 +-
src/lib/askpass.c | 2 +-
src/lib/buffer.c | 5 +++--
src/lib/buffer.h | 5 +++--
src/lib/guid.c | 2 +-
src/lib/iostream-rawlog.c | 2 +-
src/lib/istream-base64-decoder.c | 3 ++-
src/lib/istream-base64-encoder.c | 3 ++-
src/lib/str.c | 2 +-
src/login-common/sasl-server.c | 2 +-
src/plugins/fts-lucene/Snowball.cc | 2 +-
src/plugins/fts-lucene/fts-backend-lucene.c | 2 +-
src/plugins/fts-lucene/lucene-wrapper.cc | 6 +++---
src/plugins/fts/fts-expunge-log.c | 2 +-
src/pop3-login/client.c | 2 +-
src/pop3/main.c | 4 ++--
31 files changed, 53 insertions(+), 48 deletions(-)
diffs (truncated from 488 to 300 lines):
diff -r 34076ab28d28 -r 7efef678bca8 src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/auth/auth-master-connection.c Thu Sep 06 01:13:03 2012 +0300
@@ -110,7 +110,7 @@
return FALSE;
}
- buffer_create_data(&buf, cookie, sizeof(cookie));
+ buffer_create_from_data(&buf, cookie, sizeof(cookie));
if (hex_to_binary(list[3], &buf) < 0) {
i_error("BUG: Master sent broken REQUEST cookie");
return FALSE;
diff -r 34076ab28d28 -r 7efef678bca8 src/auth/mech-digest-md5.c
--- a/src/auth/mech-digest-md5.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/auth/mech-digest-md5.c Thu Sep 06 01:13:03 2012 +0300
@@ -78,7 +78,7 @@
/* get 128bit of random data as nonce */
random_fill(nonce, sizeof(nonce));
- buffer_create_data(&buf, nonce_base64, sizeof(nonce_base64));
+ buffer_create_from_data(&buf, nonce_base64, sizeof(nonce_base64));
base64_encode(nonce, sizeof(nonce), &buf);
buffer_append_c(&buf, '\0');
request->nonce = p_strdup(request->pool, buf.data);
diff -r 34076ab28d28 -r 7efef678bca8 src/imap/main.c
--- a/src/imap/main.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/imap/main.c Thu Sep 06 01:13:03 2012 +0300
@@ -267,8 +267,8 @@
input.userdb_fields = extra_fields;
input.session_id = client->session_id;
- buffer_create_const_data(&input_buf, client->data,
- client->auth_req.data_size);
+ buffer_create_from_const_data(&input_buf, client->data,
+ client->auth_req.data_size);
if (client_create_from_input(&input, client, client->fd, client->fd,
&input_buf, &error) < 0) {
int fd = client->fd;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-index/mail-index-modseq.c
--- a/src/lib-index/mail-index-modseq.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-index/mail-index-modseq.c Thu Sep 06 01:13:03 2012 +0300
@@ -350,7 +350,7 @@
return;
}
case MAIL_TRANSACTION_FLAG_UPDATE: {
- buffer_create_const_data(&uid_buf, tdata, thdr->size);
+ buffer_create_from_const_data(&uid_buf, tdata, thdr->size);
array_create_from_buffer(&uids, &uid_buf,
sizeof(struct mail_transaction_flag_update));
break;
@@ -363,14 +363,14 @@
if ((seqset_offset % 4) != 0)
seqset_offset += 4 - (seqset_offset % 4);
- buffer_create_const_data(&uid_buf,
+ buffer_create_from_const_data(&uid_buf,
CONST_PTR_OFFSET(tdata, seqset_offset),
thdr->size - seqset_offset);
array_create_from_buffer(&uids, &uid_buf, sizeof(uint32_t)*2);
break;
}
case MAIL_TRANSACTION_KEYWORD_RESET:
- buffer_create_const_data(&uid_buf, tdata, thdr->size);
+ buffer_create_from_const_data(&uid_buf, tdata, thdr->size);
array_create_from_buffer(&uids, &uid_buf,
sizeof(struct mail_transaction_keyword_reset));
break;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-index/mail-index-sync-keywords.c
--- a/src/lib-index/mail-index-sync-keywords.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-index/mail-index-sync-keywords.c Thu Sep 06 01:13:03 2012 +0300
@@ -83,8 +83,8 @@
i_assert(keywords_count > 0);
- buffer_create_data(&ext_intro_buf, ext_intro_data,
- sizeof(ext_intro_data));
+ buffer_create_from_data(&ext_intro_buf, ext_intro_data,
+ sizeof(ext_intro_data));
u = buffer_append_space_unsafe(&ext_intro_buf, sizeof(*u));
u->ext_id = ext_map_idx;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-index/mail-index-transaction-export.c
--- a/src/lib-index/mail-index-transaction-export.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-index/mail-index-transaction-export.c Thu Sep 06 01:13:03 2012 +0300
@@ -245,7 +245,7 @@
}
memset(&ext_reset, 0, sizeof(ext_reset));
- buffer_create_data(&reset_buf, &ext_reset, sizeof(ext_reset));
+ buffer_create_from_data(&reset_buf, &ext_reset, sizeof(ext_reset));
buffer_set_used_size(&reset_buf, sizeof(ext_reset));
for (ext_id = 0; ext_id < ext_count; ext_id++) {
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-index/mail-transaction-log-append.c
--- a/src/lib-index/mail-transaction-log-append.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-index/mail-transaction-log-append.c Thu Sep 06 01:13:03 2012 +0300
@@ -170,7 +170,7 @@
return;
i_assert(offset > file->saved_tail_offset);
- buffer_create_data(&buf, update_data, sizeof(update_data));
+ buffer_create_from_data(&buf, update_data, sizeof(update_data));
u = buffer_append_space_unsafe(&buf, sizeof(*u));
u->offset = offsetof(struct mail_index_header, log_file_tail_offset);
u->size = sizeof(offset);
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-index/mail-transaction-log-file.c
--- a/src/lib-index/mail-transaction-log-file.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-index/mail-transaction-log-file.c Thu Sep 06 01:13:03 2012 +0300
@@ -1564,8 +1564,8 @@
log_file_set_syscall_error(file, "madvise()");
}
- buffer_create_const_data(&file->mmap_buffer,
- file->mmap_base, file->mmap_size);
+ buffer_create_from_const_data(&file->mmap_buffer,
+ file->mmap_base, file->mmap_size);
file->buffer = &file->mmap_buffer;
file->buffer_offset = 0;
return 0;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-index/mail-transaction-log-view.c
--- a/src/lib-index/mail-transaction-log-view.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-index/mail-transaction-log-view.c Thu Sep 06 01:13:03 2012 +0300
@@ -528,7 +528,7 @@
}
break;
case MAIL_TRANSACTION_EXPUNGE:
- buffer_create_const_data(&uid_buf, data, rec_size);
+ buffer_create_from_const_data(&uid_buf, data, rec_size);
array_create_from_buffer(&uids, &uid_buf,
sizeof(struct mail_transaction_expunge));
break;
@@ -552,7 +552,7 @@
break;
}
case MAIL_TRANSACTION_FLAG_UPDATE:
- buffer_create_const_data(&uid_buf, data, rec_size);
+ buffer_create_from_const_data(&uid_buf, data, rec_size);
array_create_from_buffer(&uids, &uid_buf,
sizeof(struct mail_transaction_flag_update));
break;
@@ -575,7 +575,7 @@
return FALSE;
}
- buffer_create_const_data(&uid_buf,
+ buffer_create_from_const_data(&uid_buf,
CONST_PTR_OFFSET(data, seqset_offset),
rec_size - seqset_offset);
array_create_from_buffer(&uids, &uid_buf,
@@ -583,7 +583,7 @@
break;
}
case MAIL_TRANSACTION_KEYWORD_RESET:
- buffer_create_const_data(&uid_buf, data, rec_size);
+ buffer_create_from_const_data(&uid_buf, data, rec_size);
array_create_from_buffer(&uids, &uid_buf,
sizeof(struct mail_transaction_keyword_reset));
break;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-mail/istream-binary-converter.c
--- a/src/lib-mail/istream-binary-converter.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-mail/istream-binary-converter.c Thu Sep 06 01:13:03 2012 +0300
@@ -116,7 +116,7 @@
}
dest = i_stream_alloc(stream, BASE64_BLOCK_SIZE);
- buffer_create_data(&buf, dest, BASE64_BLOCK_SIZE);
+ buffer_create_from_data(&buf, dest, BASE64_BLOCK_SIZE);
base64_encode(base64_block, base64_block_len, &buf);
stream->pos += buf.used;
bstream->base64_block_pos++;
@@ -143,7 +143,7 @@
max_encoded_size = MAX_BASE64_ENCODED_SIZE(encode_size);
dest = i_stream_alloc(stream, max_encoded_size);
- buffer_create_data(&buf, dest, max_encoded_size);
+ buffer_create_from_data(&buf, dest, max_encoded_size);
base64_encode(data, encode_size, &buf);
stream->pos += buf.used;
bstream->base64_block_pos += encode_blocks;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-mail/istream-qp-decoder.c
--- a/src/lib-mail/istream-qp-decoder.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-mail/istream-qp-decoder.c Thu Sep 06 01:13:03 2012 +0300
@@ -57,7 +57,8 @@
return -2;
}
- buffer_create_data(&buf, stream->w_buffer + stream->pos, buffer_avail);
+ buffer_create_from_data(&buf, stream->w_buffer + stream->pos,
+ buffer_avail);
quoted_printable_decode(data, size, &pos, &buf);
stream->pos += buf.used;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-mail/test-message-header-encode.c
--- a/src/lib-mail/test-message-header-encode.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-mail/test-message-header-encode.c Thu Sep 06 01:13:03 2012 +0300
@@ -80,7 +80,7 @@
char bufdata[1000];
buffer_t buf;
- buffer_create_data(&buf, bufdata, sizeof(bufdata));
+ buffer_create_from_data(&buf, bufdata, sizeof(bufdata));
if (strncmp(str+i, "\n\t", 2) == 0) {
i += 2;
line_start = i - 1;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-otp/otp-parse.c
--- a/src/lib-otp/otp-parse.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-otp/otp-parse.c Thu Sep 06 01:13:03 2012 +0300
@@ -43,7 +43,7 @@
return -1;
str = t_str_new(18);
- buffer_create_data(&buf, hash, OTP_HASH_SIZE);
+ buffer_create_from_data(&buf, hash, OTP_HASH_SIZE);
while (*data) {
char c = *data;
@@ -90,7 +90,7 @@
data = otp_skip_lws(data);
- buffer_create_data(&buf, bits, sizeof(bits));
+ buffer_create_from_data(&buf, bits, sizeof(bits));
for (; *data && (count < OTP_WORDS_NUMBER); data++) {
char c = *data;
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-storage/index/index-mail.c
--- a/src/lib-storage/index/index-mail.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-storage/index/index-mail.c Thu Sep 06 01:13:03 2012 +0300
@@ -123,7 +123,7 @@
buffer_t buf;
int ret;
- buffer_create_data(&buf, data, data_size);
+ buffer_create_from_data(&buf, data, data_size);
if (index_mail_cache_lookup_field(mail, &buf, field_idx) <= 0)
ret = FALSE;
else {
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-storage/index/maildir/maildir-save.c Thu Sep 06 01:13:03 2012 +0300
@@ -135,7 +135,7 @@
ctx->newdir = p_strconcat(pool, path, "/new", NULL);
ctx->curdir = p_strconcat(pool, path, "/cur", NULL);
- buffer_create_const_data(&ctx->keywords_buffer, "", 0);
+ buffer_create_from_const_data(&ctx->keywords_buffer, "", 0);
array_create_from_buffer(&ctx->keywords_array, &ctx->keywords_buffer,
sizeof(unsigned int));
ctx->last_save_finished = TRUE;
@@ -279,8 +279,8 @@
}
i_assert(ctx->keywords_sync_ctx != NULL || mf->keywords_count == 0);
- buffer_create_const_data(&ctx->keywords_buffer, mf + 1,
- mf->keywords_count * sizeof(unsigned int));
+ buffer_create_from_const_data(&ctx->keywords_buffer, mf + 1,
+ mf->keywords_count * sizeof(unsigned int));
*fname_r = maildir_filename_flags_kw_set(ctx->keywords_sync_ctx,
basename,
mf->flags & MAIL_FLAGS_MASK,
diff -r 34076ab28d28 -r 7efef678bca8 src/lib-storage/mail.c
--- a/src/lib-storage/mail.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib-storage/mail.c Thu Sep 06 01:13:03 2012 +0300
@@ -334,7 +334,7 @@
if (guid_128_from_string(guid, guid_128_r) < 0) {
/* not 128bit hex. use a hash of it instead. */
- buffer_create_data(&buf, guid_128_r, GUID_128_SIZE);
+ buffer_create_from_data(&buf, guid_128_r, GUID_128_SIZE);
buffer_set_used_size(&buf, 0);
sha1_get_digest(guid, strlen(guid), sha1_sum);
#if SHA1_RESULTLEN < DBOX_GUID_BIN_LEN
diff -r 34076ab28d28 -r 7efef678bca8 src/lib/askpass.c
--- a/src/lib/askpass.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib/askpass.c Thu Sep 06 01:13:03 2012 +0300
@@ -58,7 +58,7 @@
{
buffer_t str;
- buffer_create_data(&str, buf, buf_size);
+ buffer_create_from_data(&str, buf, buf_size);
askpass_str(prompt, &str);
buffer_append_c(&str, '\0');
}
diff -r 34076ab28d28 -r 7efef678bca8 src/lib/buffer.c
--- a/src/lib/buffer.c Thu Sep 06 01:04:57 2012 +0300
+++ b/src/lib/buffer.c Thu Sep 06 01:13:03 2012 +0300
@@ -86,7 +86,7 @@
i_assert(buf->used <= buf->alloc);
}
-void buffer_create_data(buffer_t *buffer, void *data, size_t size)
+void buffer_create_from_data(buffer_t *buffer, void *data, size_t size)
{
struct real_buffer *buf;
@@ -102,7 +102,8 @@
memset(data, 0, size);
}
More information about the dovecot-cvs
mailing list