dovecot-2.0: Removed dead code.
dovecot at dovecot.org
dovecot at dovecot.org
Mon Apr 5 01:06:06 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/0f98525e4567
changeset: 11039:0f98525e4567
user: Timo Sirainen <tss at iki.fi>
date: Mon Apr 05 01:06:02 2010 +0300
description:
Removed dead code.
diffstat:
src/auth/auth-master-connection.c | 4 +---
src/auth/auth-request-handler.c | 4 ++--
src/config/old-set-parser.c | 4 ++--
src/dict/dict-commands.c | 3 +--
src/doveadm/doveadm-dump-log.c | 4 ++--
src/imap/cmd-close.c | 3 +--
src/imap/cmd-list.c | 3 +--
src/imap/cmd-select.c | 8 +++-----
src/imap/cmd-sort.c | 2 +-
src/imap/cmd-unselect.c | 2 --
src/lda/main.c | 2 +-
src/lib-imap/imap-match.c | 2 +-
src/lib-index/mail-cache-transaction.c | 4 ++--
src/lib-index/mail-index-sync-ext.c | 6 +++---
src/lib-index/mail-index-sync-update.c | 9 ++++-----
src/lib-index/mail-index-view-sync.c | 8 +++-----
src/lib-index/mail-index-view.c | 2 +-
src/lib-index/mail-transaction-log-file.c | 2 +-
src/lib-lda/mail-send.c | 3 +--
src/lib-mail/message-header-decode.c | 2 +-
src/lib-mail/message-header-parser.c | 3 +--
src/lib-mail/test-istream-header-filter.c | 3 +--
src/lib-storage/index/cydir/cydir-save.c | 3 +--
src/lib-storage/index/dbox-common/dbox-file-fix.c | 10 ++++------
src/lib-storage/index/dbox-multi/mdbox-file.c | 4 ++--
src/lib-storage/index/index-mail.c | 5 ++---
src/lib-storage/index/index-thread.c | 1 -
src/lib-storage/index/maildir/maildir-save.c | 12 ++++--------
src/lib-storage/index/maildir/maildir-storage.h | 5 ++---
src/lib-storage/index/maildir/maildir-sync.c | 7 ++-----
src/lib-storage/index/mbox/istream-raw-mbox.c | 1 -
src/lib-storage/index/mbox/mbox-lock.c | 6 ++----
src/lib-storage/index/mbox/mbox-save.c | 1 -
src/lib-storage/index/mbox/mbox-sync-update.c | 6 ++----
src/lib-storage/list/mailbox-list-fs.c | 3 +--
src/lib-storage/mail-storage-service.c | 7 ++-----
src/lib/askpass.c | 3 +--
src/lib/file-cache.c | 1 -
src/lib/file-dotlock.c | 3 +--
src/lib/home-expand.c | 4 ++--
src/lib/istream-tee.c | 2 +-
src/lib/seq-range-array.c | 2 +-
src/lib/strescape.c | 2 --
src/lib/strfuncs.c | 2 +-
src/login-common/client-common-auth.c | 4 +---
src/login-common/ssl-proxy-openssl.c | 4 ++--
src/master/main.c | 2 +-
src/plugins/fts-squat/squat-trie.c | 1 -
src/plugins/lazy-expunge/lazy-expunge-plugin.c | 2 --
src/pop3/pop3-client.c | 4 +---
src/util/maildirlock.c | 3 +--
51 files changed, 71 insertions(+), 122 deletions(-)
diffs (truncated from 1006 to 300 lines):
diff -r f72884695084 -r 0f98525e4567 src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/auth/auth-master-connection.c Mon Apr 05 01:06:02 2010 +0300
@@ -464,9 +464,7 @@
static int master_output(struct auth_master_connection *conn)
{
- int ret;
-
- if ((ret = o_stream_flush(conn->output)) < 0) {
+ if (o_stream_flush(conn->output) < 0) {
/* transmit error, probably master died */
auth_master_connection_destroy(&conn);
return 1;
diff -r f72884695084 -r 0f98525e4567 src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/auth/auth-request-handler.c Mon Apr 05 01:06:02 2010 +0300
@@ -103,7 +103,7 @@
struct auth_stream_reply *reply)
{
const char **fields, *extra_fields;
- unsigned int src, dest;
+ unsigned int src;
bool seen_pass = FALSE;
if (auth_stream_is_empty(request->extra_fields))
@@ -120,7 +120,7 @@
}
fields = t_strsplit(extra_fields, "\t");
- for (src = dest = 0; fields[src] != NULL; src++) {
+ for (src = 0; fields[src] != NULL; src++) {
if (strncmp(fields[src], "userdb_", 7) != 0) {
if (!seen_pass && strncmp(fields[src], "pass=", 5) == 0)
seen_pass = TRUE;
diff -r f72884695084 -r 0f98525e4567 src/config/old-set-parser.c
--- a/src/config/old-set-parser.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/config/old-set-parser.c Mon Apr 05 01:06:02 2010 +0300
@@ -202,9 +202,9 @@
static bool listen_has_port(const char *str)
{
- const char *p, *const *addrs;
+ const char *const *addrs;
- if ((p = strchr(str, ':')) == NULL)
+ if (strchr(str, ':') == NULL)
return FALSE;
addrs = t_strsplit_spaces(str, ", ");
diff -r f72884695084 -r 0f98525e4567 src/dict/dict-commands.c
--- a/src/dict/dict-commands.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/dict/dict-commands.c Mon Apr 05 01:06:02 2010 +0300
@@ -48,7 +48,6 @@
{
string_t *str;
const char *key, *value;
- int ret;
str = t_str_new(256);
o_stream_cork(conn->output);
@@ -73,7 +72,7 @@
o_stream_unset_flush_callback(conn->output);
str_truncate(str, 0);
- if ((ret = dict_iterate_deinit(&conn->iter_ctx)) < 0)
+ if (dict_iterate_deinit(&conn->iter_ctx) < 0)
str_append_c(str, DICT_PROTOCOL_REPLY_FAIL);
str_append_c(str, '\n');
o_stream_send(conn->output, str_data(str), str_len(str));
diff -r f72884695084 -r 0f98525e4567 src/doveadm/doveadm-dump-log.c
--- a/src/doveadm/doveadm-dump-log.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/doveadm/doveadm-dump-log.c Mon Apr 05 01:06:02 2010 +0300
@@ -397,7 +397,7 @@
break;
}
case MAIL_TRANSACTION_UID_UPDATE: {
- const struct mail_transaction_uid_update *rec = data, *end;
+ const struct mail_transaction_uid_update *rec, *end;
end = CONST_PTR_OFFSET(data, size);
for (rec = data; rec < end; rec++) {
@@ -407,7 +407,7 @@
break;
}
case MAIL_TRANSACTION_MODSEQ_UPDATE: {
- const struct mail_transaction_modseq_update *rec = data, *end;
+ const struct mail_transaction_modseq_update *rec, *end;
end = CONST_PTR_OFFSET(data, size);
for (rec = data; rec < end; rec++) {
diff -r f72884695084 -r 0f98525e4567 src/imap/cmd-close.c
--- a/src/imap/cmd-close.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/imap/cmd-close.c Mon Apr 05 01:06:02 2010 +0300
@@ -9,7 +9,6 @@
struct client *client = cmd->client;
struct mailbox *mailbox = client->mailbox;
struct mail_storage *storage;
- int ret;
if (!client_verify_open_mailbox(cmd))
return TRUE;
@@ -18,7 +17,7 @@
client->mailbox = NULL;
storage = mailbox_get_storage(mailbox);
- if ((ret = imap_expunge(mailbox, NULL)) < 0)
+ if (imap_expunge(mailbox, NULL) < 0)
client_send_untagged_storage_error(client, storage);
if (mailbox_sync(mailbox, 0) < 0)
client_send_untagged_storage_error(client, storage);
diff -r f72884695084 -r 0f98525e4567 src/imap/cmd-list.c
--- a/src/imap/cmd-list.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/imap/cmd-list.c Mon Apr 05 01:06:02 2010 +0300
@@ -358,12 +358,11 @@
const struct mailbox_info *info;
struct mail_namespace *ns;
enum mailbox_info_flags flags;
- string_t *str, *name_str;
+ string_t *str;
const char *name;
int ret = 0;
str = t_str_new(256);
- name_str = t_str_new(256);
while ((info = mailbox_list_iter_next(ctx->list_iter)) != NULL) {
name = info->name;
flags = info->flags;
diff -r f72884695084 -r 0f98525e4567 src/imap/cmd-select.c
--- a/src/imap/cmd-select.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/imap/cmd-select.c Mon Apr 05 01:06:02 2010 +0300
@@ -30,13 +30,12 @@
const ARRAY_TYPE(seq_range) *seqset,
const ARRAY_TYPE(seq_range) *uidset)
{
- const struct seq_range *seq_range, *uid_range;
+ const struct seq_range *uid_range;
struct seq_range_iter seq_iter;
- unsigned int i, seq_count, uid_count, diff, n = 0;
+ unsigned int i, uid_count, diff, n = 0;
uint32_t seq;
/* change all n:m ranges to n,m and store the results */
- seq_range = array_get(seqset, &seq_count);
uid_range = array_get(uidset, &uid_count);
seq_range_array_iter_init(&seq_iter, seqset);
@@ -200,9 +199,8 @@
static bool cmd_select_continue(struct client_command_context *cmd)
{
struct imap_select_context *ctx = cmd->context;
- int ret;
- if ((ret = imap_fetch_more(ctx->fetch_ctx)) == 0) {
+ if (imap_fetch_more(ctx->fetch_ctx) == 0) {
/* unfinished */
return FALSE;
}
diff -r f72884695084 -r 0f98525e4567 src/imap/cmd-sort.c
--- a/src/imap/cmd-sort.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/imap/cmd-sort.c Mon Apr 05 01:06:02 2010 +0300
@@ -78,7 +78,7 @@
client_send_command_error(cmd, "Sort list ends with REVERSE.");
return -1;
}
- program[pos++] = MAIL_SORT_END;
+ program[pos] = MAIL_SORT_END;
if (args->type != IMAP_ARG_EOL) {
client_send_command_error(cmd,
diff -r f72884695084 -r 0f98525e4567 src/imap/cmd-unselect.c
--- a/src/imap/cmd-unselect.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/imap/cmd-unselect.c Mon Apr 05 01:06:02 2010 +0300
@@ -7,7 +7,6 @@
{
struct client *client = cmd->client;
struct mailbox *mailbox = client->mailbox;
- struct mail_storage *storage;
if (!client_verify_open_mailbox(cmd))
return TRUE;
@@ -17,7 +16,6 @@
i_assert(client->mailbox_change_lock == NULL);
client->mailbox = NULL;
- storage = mailbox_get_storage(mailbox);
mailbox_free(&mailbox);
client_update_mailbox_flags(client, NULL);
diff -r f72884695084 -r 0f98525e4567 src/lda/main.c
--- a/src/lda/main.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/lda/main.c Mon Apr 05 01:06:02 2010 +0300
@@ -167,7 +167,7 @@
if (ret > 0 && size >= 5 && memcmp(data, "From ", 5) == 0) {
/* skip until the first LF */
i_stream_skip(input, 5);
- while ((ret = i_stream_read_data(input, &data, &size, 0)) > 0) {
+ while (i_stream_read_data(input, &data, &size, 0) > 0) {
for (i = 0; i < size; i++) {
if (data[i] == '\n')
break;
diff -r f72884695084 -r 0f98525e4567 src/lib-imap/imap-match.c
--- a/src/lib-imap/imap-match.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/lib-imap/imap-match.c Mon Apr 05 01:06:02 2010 +0300
@@ -69,7 +69,7 @@
*dest++ = *pattern++;
}
}
- *dest++ = '\0';
+ *dest = '\0';
return ret;
}
diff -r f72884695084 -r 0f98525e4567 src/lib-index/mail-cache-transaction.c
--- a/src/lib-index/mail-cache-transaction.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/lib-index/mail-cache-transaction.c Mon Apr 05 01:06:02 2010 +0300
@@ -884,7 +884,7 @@
struct mail_cache *cache = ctx->cache;
int ret;
- if ((ret = mail_cache_transaction_lock(ctx)) <= 0) {
+ if (mail_cache_transaction_lock(ctx) <= 0) {
if (MAIL_CACHE_IS_UNUSABLE(cache))
return -1;
@@ -895,7 +895,7 @@
return 0;
/* need to add it */
- if ((ret = mail_cache_transaction_lock(ctx)) <= 0)
+ if (mail_cache_transaction_lock(ctx) <= 0)
return -1;
}
diff -r f72884695084 -r 0f98525e4567 src/lib-index/mail-index-sync-ext.c
--- a/src/lib-index/mail-index-sync-ext.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/lib-index/mail-index-sync-ext.c Mon Apr 05 01:06:02 2010 +0300
@@ -338,7 +338,7 @@
sync_ext_reorder(map, ext_map_idx, old_record_size);
} else if (modified) {
/* header size changed. recreate index file. */
- map = mail_index_sync_get_atomic_map(ctx);
+ (void)mail_index_sync_get_atomic_map(ctx);
}
}
@@ -372,7 +372,7 @@
const struct mail_index_ext_header *ext_hdr,
uint32_t *ext_map_idx_r)
{
- struct mail_index_map *map = ctx->view->map;
+ struct mail_index_map *map;
const struct mail_index_ext *ext;
buffer_t *hdr_buf;
uint32_t ext_map_idx;
@@ -573,7 +573,7 @@
int mail_index_sync_ext_reset(struct mail_index_sync_map_ctx *ctx,
const struct mail_transaction_ext_reset *u)
{
- struct mail_index_map *map = ctx->view->map;
+ struct mail_index_map *map;
struct mail_index_ext_header *ext_hdr;
struct mail_index_ext *ext;
diff -r f72884695084 -r 0f98525e4567 src/lib-index/mail-index-sync-update.c
--- a/src/lib-index/mail-index-sync-update.c Mon Apr 05 01:04:19 2010 +0300
+++ b/src/lib-index/mail-index-sync-update.c Mon Apr 05 01:06:02 2010 +0300
@@ -237,7 +237,7 @@
static void
sync_expunge(struct mail_index_sync_map_ctx *ctx, uint32_t uid1, uint32_t uid2)
{
- struct mail_index_map *map = ctx->view->map;
+ struct mail_index_map *map;
struct mail_index_record *rec;
uint32_t seq_count, seq, seq1, seq2;
@@ -673,7 +673,7 @@
break;
}
case MAIL_TRANSACTION_EXT_HDR_UPDATE: {
- const struct mail_transaction_ext_hdr_update *rec = data;
+ const struct mail_transaction_ext_hdr_update *rec;
unsigned int i;
for (i = 0; i < hdr->size; ) {
@@ -699,7 +699,7 @@
break;
}
case MAIL_TRANSACTION_EXT_HDR_UPDATE32: {
- const struct mail_transaction_ext_hdr_update32 *rec = data;
+ const struct mail_transaction_ext_hdr_update32 *rec;
unsigned int i;
for (i = 0; i < hdr->size; ) {
@@ -779,7 +779,6 @@
break;
}
- rec = data;
end = CONST_PTR_OFFSET(data, hdr->size);
More information about the dovecot-cvs
mailing list