dovecot-1.2: Removed unused code.

dovecot at dovecot.org dovecot at dovecot.org
Tue Mar 24 19:06:39 EET 2009


details:   http://hg.dovecot.org/dovecot-1.2/rev/ed8e33c2199e
changeset: 8852:ed8e33c2199e
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Mar 24 13:06:31 2009 -0400
description:
Removed unused code.
Based on coccinelle output from Diego Liziero.

diffstat:

3 files changed, 7 insertions(+), 12 deletions(-)
src/lib-storage/index/maildir/maildir-copy.c |   12 +++++-------
src/lib/file-dotlock.c                       |    2 --
src/lib/istream-crlf.c                       |    5 ++---

diffs (81 lines):

diff -r 1c76e82e0b36 -r ed8e33c2199e src/lib-storage/index/maildir/maildir-copy.c
--- a/src/lib-storage/index/maildir/maildir-copy.c	Tue Mar 24 13:02:59 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-copy.c	Tue Mar 24 13:06:31 2009 -0400
@@ -133,7 +133,6 @@ maildir_copy_hardlink(struct maildir_tra
 	struct maildir_mailbox *dest_mbox =
 		(struct maildir_mailbox *)t->ictx.ibox;
 	struct maildir_mailbox *src_mbox;
-	struct maildir_save_context *ctx;
 	struct hardlink_ctx do_ctx;
 	const char *path, *filename = NULL;
 	uint32_t seq;
@@ -152,7 +151,6 @@ maildir_copy_hardlink(struct maildir_tra
 
 	if (t->save_ctx == NULL)
 		t->save_ctx = maildir_save_transaction_init(t);
-	ctx = t->save_ctx;
 
 	/* don't allow caller to specify recent flag */
 	flags &= ~MAIL_RECENT;
@@ -239,15 +237,15 @@ maildir_copy_hardlink(struct maildir_tra
 #if 0
 	if (keywords == NULL || keywords->count == 0) {
 		/* hardlinked to destination, set hardlinked-flag */
-		seq = maildir_save_add(t, do_ctx.dest_fname,
-				       flags | MAILDIR_SAVE_FLAG_HARDLINK, NULL,
-				       dest_mail);
+		maildir_save_add(t, do_ctx.dest_fname,
+				 flags | MAILDIR_SAVE_FLAG_HARDLINK, NULL,
+				 dest_mail);
 	} else
 #endif
 {
 		/* hardlinked to tmp/, treat as normal copied mail */
-		seq = maildir_save_add(t, do_ctx.dest_fname, flags, keywords,
-				       dest_mail);
+		maildir_save_add(t, do_ctx.dest_fname, flags, keywords,
+				 dest_mail);
 	}
 	return 1;
 }
diff -r 1c76e82e0b36 -r ed8e33c2199e src/lib/file-dotlock.c
--- a/src/lib/file-dotlock.c	Tue Mar 24 13:02:59 2009 -0400
+++ b/src/lib/file-dotlock.c	Tue Mar 24 13:06:31 2009 -0400
@@ -793,12 +793,10 @@ int file_dotlock_replace(struct dotlock 
 {
 	struct dotlock *dotlock;
 	const char *lock_path;
-	int fd;
 
 	dotlock = *dotlock_p;
 	*dotlock_p = NULL;
 
-	fd = dotlock->fd;
 	if ((flags & DOTLOCK_REPLACE_FLAG_DONT_CLOSE_FD) != 0)
 		dotlock->fd = -1;
 
diff -r 1c76e82e0b36 -r ed8e33c2199e src/lib/istream-crlf.c
--- a/src/lib/istream-crlf.c	Tue Mar 24 13:02:59 2009 -0400
+++ b/src/lib/istream-crlf.c	Tue Mar 24 13:06:31 2009 -0400
@@ -32,11 +32,10 @@ static int i_stream_crlf_read_common(str
 static int i_stream_crlf_read_common(struct crlf_istream *cstream)
 {
 	struct istream_private *stream = &cstream->istream;
-	const unsigned char *data;
 	size_t size;
 	ssize_t ret;
 
-	data = i_stream_get_data(stream->parent, &size);
+	(void)i_stream_get_data(stream->parent, &size);
 	if (size == 0) {
 		ret = i_stream_read(stream->parent);
 		if (ret <= 0 && (ret != -2 || stream->skip == 0)) {
@@ -45,7 +44,7 @@ static int i_stream_crlf_read_common(str
 			stream->istream.eof = stream->parent->eof;
 			return ret;
 		}
-		data = i_stream_get_data(stream->parent, &size);
+		(void)i_stream_get_data(stream->parent, &size);
 		i_assert(size != 0);
 	}
 


More information about the dovecot-cvs mailing list