dovecot: Changed buffer_free() and buffer_free_without_data() AP...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 13:53:14 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/a6a49d5efc59
changeset: 6414:a6a49d5efc59
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 12:09:30 2007 +0300
description:
Changed buffer_free() and buffer_free_without_data() APIs to take ** pointer
which is set to NULL instead of hiding it with a macro.
diffstat:
30 files changed, 46 insertions(+), 54 deletions(-)
src/auth/auth-request-handler.c | 2 +-
src/auth/auth-worker-server.c | 5 ++---
src/auth/mech-rpa.c | 4 ++--
src/auth/password-scheme-rpa.c | 2 +-
src/lib-auth/auth-client.c | 2 +-
src/lib-auth/auth-server-connection.c | 2 +-
src/lib-index/mail-cache-compress.c | 4 ++--
src/lib-index/mail-cache-transaction.c | 2 +-
src/lib-index/mail-cache.c | 2 +-
src/lib-index/mail-index-fsck.c | 2 +-
src/lib-index/mail-index-map.c | 9 +++------
src/lib-index/mail-index-sync-ext.c | 2 +-
src/lib-index/mail-index-sync-update.c | 2 +-
src/lib-index/mail-transaction-log-append.c | 4 ++--
src/lib-index/mail-transaction-log-file.c | 8 ++++----
src/lib-index/mailbox-list-index-sync.c | 2 +-
src/lib-mail/message-decoder.c | 4 ++--
src/lib-mail/message-header-parser.c | 2 +-
src/lib-ntlm/ntlm-encrypt.c | 2 +-
src/lib-ntlm/ntlm-message.c | 2 +-
src/lib-storage/index/index-mail.c | 2 +-
src/lib/array.h | 3 +--
src/lib/buffer.c | 4 ++--
src/lib/buffer.h | 6 ++----
src/lib/file-cache.c | 2 +-
src/lib/istream-seekable.c | 5 ++---
src/lib/str.c | 4 ++--
src/plugins/fts-squat/squat-trie.c | 2 +-
src/plugins/fts-squat/squat-uidlist.c | 4 ++--
src/pop3/client.c | 4 ++--
diffs (truncated from 479 to 300 lines):
diff -r a991fa000b20 -r a6a49d5efc59 src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/auth/auth-request-handler.c Sun Sep 16 12:09:30 2007 +0300
@@ -513,6 +513,6 @@ void auth_request_handler_deinit(void)
void auth_request_handler_deinit(void)
{
auth_request_handler_flush_failures();
- buffer_free(auth_failures_buf);
+ buffer_free(&auth_failures_buf);
timeout_remove(&to_auth_failures);
}
diff -r a991fa000b20 -r a6a49d5efc59 src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/auth/auth-worker-server.c Sun Sep 16 12:09:30 2007 +0300
@@ -128,7 +128,7 @@ static void auth_worker_destroy(struct a
}
- buffer_free(conn->requests);
+ buffer_free(&conn->requests);
io_remove(&conn->io);
i_stream_destroy(&conn->input);
o_stream_destroy(&conn->output);
@@ -393,8 +393,7 @@ void auth_worker_server_deinit(void)
connp = buffer_get_modifiable_data(connections, NULL);
auth_worker_destroy(*connp);
}
- buffer_free(connections);
- connections = NULL;
+ buffer_free(&connections);
timeout_remove(&to);
i_free(worker_socket_path);
diff -r a991fa000b20 -r a6a49d5efc59 src/auth/mech-rpa.c
--- a/src/auth/mech-rpa.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/auth/mech-rpa.c Sun Sep 16 12:09:30 2007 +0300
@@ -401,7 +401,7 @@ mech_rpa_build_token2(struct rpa_auth_re
buffer_append(buf, str_c(realms), realms_len);
*size = buffer_get_used_size(buf);
- return buffer_free_without_data(buf);
+ return buffer_free_without_data(&buf);
}
static const unsigned char *
@@ -434,7 +434,7 @@ mech_rpa_build_token4(struct rpa_auth_re
buffer_append_c(buf, 0);
*size = buffer_get_used_size(buf);
- return buffer_free_without_data(buf);
+ return buffer_free_without_data(&buf);
}
static bool verify_credentials(struct rpa_auth_request *request,
diff -r a991fa000b20 -r a6a49d5efc59 src/auth/password-scheme-rpa.c
--- a/src/auth/password-scheme-rpa.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/auth/password-scheme-rpa.c Sun Sep 16 12:09:30 2007 +0300
@@ -21,7 +21,7 @@ void *ucs2be_str(pool_t pool, const char
}
*size = buffer_get_used_size(buf);
- return buffer_free_without_data(buf);
+ return buffer_free_without_data(&buf);
}
void password_generate_rpa(const char *pw, unsigned char result[])
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-auth/auth-client.c
--- a/src/lib-auth/auth-client.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-auth/auth-client.c Sun Sep 16 12:09:30 2007 +0300
@@ -37,7 +37,7 @@ void auth_client_free(struct auth_client
size /= sizeof(*mech);
for (i = 0; i < size; i++)
i_free(mech[i].name);
- buffer_free(client->available_auth_mechs);
+ buffer_free(&client->available_auth_mechs);
while (client->connections != NULL) {
next = client->connections->next;
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-auth/auth-server-connection.c
--- a/src/lib-auth/auth-server-connection.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-auth/auth-server-connection.c Sun Sep 16 12:09:30 2007 +0300
@@ -302,7 +302,7 @@ static void auth_server_connection_unref
i_assert(conn->refcount == 0);
hash_destroy(conn->requests);
- buffer_free(conn->auth_mechs_buf);
+ buffer_free(&conn->auth_mechs_buf);
i_stream_unref(&conn->input);
o_stream_unref(&conn->output);
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-cache-compress.c
--- a/src/lib-index/mail-cache-compress.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-cache-compress.c Sun Sep 16 12:09:30 2007 +0300
@@ -256,8 +256,8 @@ mail_cache_copy(struct mail_cache *cache
o_stream_send(output, ctx.buffer->data, ctx.buffer->used);
hdr.used_file_size = output->offset;
- buffer_free(ctx.buffer);
- buffer_free(ctx.field_seen);
+ buffer_free(&ctx.buffer);
+ buffer_free(&ctx.field_seen);
o_stream_seek(output, 0);
o_stream_send(output, &hdr, sizeof(hdr));
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-cache-transaction.c
--- a/src/lib-index/mail-cache-transaction.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-cache-transaction.c Sun Sep 16 12:09:30 2007 +0300
@@ -95,7 +95,7 @@ static void mail_cache_transaction_free(
ctx->view->trans_seq1 = ctx->view->trans_seq2 = 0;
if (ctx->cache_data != NULL)
- buffer_free(ctx->cache_data);
+ buffer_free(&ctx->cache_data);
if (array_is_created(&ctx->cache_data_seq))
array_free(&ctx->cache_data_seq);
array_free(&ctx->reservations);
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-cache.c
--- a/src/lib-index/mail-cache.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-cache.c Sun Sep 16 12:09:30 2007 +0300
@@ -619,6 +619,6 @@ void mail_cache_view_close(struct mail_c
mail_index_view_close(&view->trans_view);
array_free(&view->looping_offsets);
- buffer_free(view->cached_exists_buf);
+ buffer_free(&view->cached_exists_buf);
i_free(view);
}
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-index-fsck.c
--- a/src/lib-index/mail-index-fsck.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-index-fsck.c Sun Sep 16 12:09:30 2007 +0300
@@ -245,7 +245,7 @@ mail_index_fsck_keywords(struct mail_ind
/* keywords changed unexpectedly, so all views are broken now */
index->inconsistency_id++;
- buffer_free(dest);
+ buffer_free(&dest);
t_pop();
}
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-index-map.c
--- a/src/lib-index/mail-index-map.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-index-map.c Sun Sep 16 12:09:30 2007 +0300
@@ -485,9 +485,7 @@ static int mail_index_mmap(struct mail_i
i_assert(rec_map->mmap_base == NULL);
- buffer_free(rec_map->buffer);
- rec_map->buffer = NULL;
-
+ buffer_free(&rec_map->buffer);
if (file_size > SSIZE_T_MAX) {
/* too large file to map into memory */
mail_index_set_error(index, "Index file too large: %s",
@@ -925,8 +923,7 @@ static void mail_index_record_map_free(s
if (rec_map->buffer != NULL) {
i_assert(rec_map->mmap_base == NULL);
- buffer_free(rec_map->buffer);
- rec_map->buffer = NULL;
+ buffer_free(&rec_map->buffer);
} else if (rec_map->mmap_base != NULL) {
i_assert(rec_map->buffer == NULL);
if (munmap(rec_map->mmap_base, rec_map->mmap_size) < 0)
@@ -969,7 +966,7 @@ void mail_index_unmap(struct mail_index_
pool_unref(map->extension_pool);
if (array_is_created(&map->keyword_idx_map))
array_free(&map->keyword_idx_map);
- buffer_free(map->hdr_copy_buf);
+ buffer_free(&map->hdr_copy_buf);
i_free(map);
}
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-index-sync-ext.c
--- a/src/lib-index/mail-index-sync-ext.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-index-sync-ext.c Sun Sep 16 12:09:30 2007 +0300
@@ -245,7 +245,7 @@ static void sync_ext_reorder(struct mail
buffer_append_zero(new_buffer, space);
}
- buffer_free(map->rec_map->buffer);
+ buffer_free(&map->rec_map->buffer);
map->rec_map->buffer = new_buffer;
map->rec_map->records =
buffer_get_modifiable_data(map->rec_map->buffer, NULL);
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-index-sync-update.c
--- a/src/lib-index/mail-index-sync-update.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-index-sync-update.c Sun Sep 16 12:09:30 2007 +0300
@@ -617,7 +617,7 @@ void mail_index_sync_map_deinit(struct m
void mail_index_sync_map_deinit(struct mail_index_sync_map_ctx *sync_map_ctx)
{
if (sync_map_ctx->unknown_extensions != NULL)
- buffer_free(sync_map_ctx->unknown_extensions);
+ buffer_free(&sync_map_ctx->unknown_extensions);
if (sync_map_ctx->expunge_handlers_used)
mail_index_sync_deinit_expunge_handlers(sync_map_ctx);
mail_index_sync_deinit_handlers(sync_map_ctx);
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-transaction-log-append.c
--- a/src/lib-index/mail-transaction-log-append.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-transaction-log-append.c Sun Sep 16 12:09:30 2007 +0300
@@ -559,10 +559,10 @@ mail_transaction_log_append_locked(struc
append_offset = file->sync_offset;
if (log_buffer_write(&ctx) < 0) {
- buffer_free(ctx.output);
+ buffer_free(&ctx.output);
return -1;
}
- buffer_free(ctx.output);
+ buffer_free(&ctx.output);
if ((t->flags & MAIL_INDEX_TRANSACTION_FLAG_HIDE) != 0) {
/* mark the area covered by this transaction hidden */
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mail-transaction-log-file.c
--- a/src/lib-index/mail-transaction-log-file.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mail-transaction-log-file.c Sun Sep 16 12:09:30 2007 +0300
@@ -76,7 +76,7 @@ void mail_transaction_log_file_free(stru
file->log->head = NULL;
if (file->buffer != NULL)
- buffer_free(file->buffer);
+ buffer_free(&file->buffer);
if (file->mmap_base != NULL) {
if (munmap(file->mmap_base, file->mmap_size) < 0) {
@@ -956,7 +956,7 @@ mail_transaction_log_file_mmap(struct ma
{
if (file->buffer != NULL) {
/* in case we just switched to mmaping */
- buffer_free(file->buffer);
+ buffer_free(&file->buffer);
}
file->mmap_size = file->last_size;
file->mmap_base = mmap(NULL, file->mmap_size, PROT_READ, MAP_SHARED,
@@ -996,7 +996,7 @@ mail_transaction_log_file_munmap(struct
}
file->mmap_base = NULL;
file->mmap_size = 0;
- buffer_free(file->buffer);
+ buffer_free(&file->buffer);
}
int mail_transaction_log_file_map(struct mail_transaction_log_file *file,
@@ -1111,7 +1111,7 @@ void mail_transaction_log_file_move_to_m
buf = buffer_create_dynamic(default_pool, file->mmap_size);
buffer_append(buf, file->mmap_base, file->mmap_size);
- buffer_free(file->buffer);
+ buffer_free(&file->buffer);
file->buffer = buf;
/* and lose the mmap */
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-index/mailbox-list-index-sync.c
--- a/src/lib-index/mailbox-list-index-sync.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-index/mailbox-list-index-sync.c Sun Sep 16 12:09:30 2007 +0300
@@ -888,7 +888,7 @@ mailbox_list_index_sync_write(struct mai
}
if (ctx->index->mmap_base == NULL) {
o_stream_destroy(&ctx->output);
- buffer_free(ctx->output_buf);
+ buffer_free(&ctx->output_buf);
}
return ret;
}
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-mail/message-decoder.c
--- a/src/lib-mail/message-decoder.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-mail/message-decoder.c Sun Sep 16 12:09:30 2007 +0300
@@ -66,8 +66,8 @@ void message_decoder_deinit(struct messa
if (ctx->charset_trans != NULL)
charset_to_utf8_end(&ctx->charset_trans);
- buffer_free(ctx->buf);
- buffer_free(ctx->buf2);
+ buffer_free(&ctx->buf);
+ buffer_free(&ctx->buf2);
i_free(ctx->content_charset);
i_free(ctx);
}
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-mail/message-header-parser.c
--- a/src/lib-mail/message-header-parser.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-mail/message-header-parser.c Sun Sep 16 12:09:30 2007 +0300
@@ -45,7 +45,7 @@ void message_parse_header_deinit(struct
i_stream_skip(ctx->input, ctx->skip);
if (ctx->value_buf != NULL)
- buffer_free(ctx->value_buf);
+ buffer_free(&ctx->value_buf);
str_free(&ctx->name);
i_free(ctx);
diff -r a991fa000b20 -r a6a49d5efc59 src/lib-ntlm/ntlm-encrypt.c
--- a/src/lib-ntlm/ntlm-encrypt.c Sun Sep 16 12:08:07 2007 +0300
+++ b/src/lib-ntlm/ntlm-encrypt.c Sun Sep 16 12:09:30 2007 +0300
@@ -29,7 +29,7 @@ t_unicode_str(const char *src, bool ucas
}
*size = buffer_get_used_size(wstr);
- return buffer_free_without_data(wstr);
+ return buffer_free_without_data(&wstr);
}
More information about the dovecot-cvs
mailing list