Mercurial > dovecot > original-hg > dovecot-1.2

changeset 579:e524da896d92 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Several minor fixes: signess, casting away const, missing static, etc.
author Timo Sirainen <tss@iki.fi>
date Mon, 04 Nov 2002 09:11:32 +0200
parents 4305e0c739cf
children a0eb55ddb5f0
files src/lib-charset/charset-ascii.c src/lib-charset/charset-iconv.c src/lib-imap/imap-date.c src/lib-imap/imap-quote.c src/lib-index/mail-custom-flags.c src/lib-index/mail-index-data.c src/lib-index/mail-index-update.c src/lib-index/mail-modifylog.c src/lib-mail/message-parser.c src/lib-storage/index/mbox/mbox-expunge.c src/lib/ibuffer-mmap.c src/lib/ibuffer.c src/lib/macros.h src/lib/md5.c src/lib/obuffer-file.c src/lib/write-full.c
diffstat 16 files changed, 32 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-charset/charset-ascii.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-charset/charset-ascii.c	Mon Nov 04 09:11:32 2002 +0200
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
+#include "charset-utf8.h"
 
 #ifndef HAVE_ICONV_H
 
--- a/src/lib-charset/charset-iconv.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-charset/charset-iconv.c	Mon Nov 04 09:11:32 2002 +0200
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
+#include "charset-utf8.h"
 
 #ifdef HAVE_ICONV_H
 
--- a/src/lib-imap/imap-date.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-imap/imap-date.c	Mon Nov 04 09:11:32 2002 +0200
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "utc-offset.h"
 #include "utc-mktime.h"
+#include "imap-date.h"
 
 #include <ctype.h>
 
@@ -139,7 +140,7 @@
 	return TRUE;
 }
 
-const char *imap_to_datetime_internal(struct tm *tm, int timezone_offset)
+static const char *imap_to_datetime_internal(struct tm *tm, int timezone_offset)
 {
 	int negative;
 
--- a/src/lib-imap/imap-quote.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-imap/imap-quote.c	Mon Nov 04 09:11:32 2002 +0200
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "temp-string.h"
+#include "imap-quote.h"
 
 #define IS_BREAK_CHAR(c) \
 	((c) == ' ' || (c) == '\t' || \
--- a/src/lib-index/mail-custom-flags.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-index/mail-custom-flags.c	Mon Nov 04 09:11:32 2002 +0200
@@ -503,8 +503,9 @@
 			       const char *custom_flags[], unsigned int count)
 {
 	MailFlags oldflags, flag;
-	unsigned int i;
-	int idx;
+	int i, idx;
+
+	i_assert(count < 32);
 
 	if ((*flags & MAIL_CUSTOM_FLAGS_MASK) == 0)
 		return 1;
@@ -516,7 +517,7 @@
 	*flags &= MAIL_SYSTEM_FLAGS_MASK;
 
 	flag = MAIL_CUSTOM_FLAG_1;
-	for (i = 0; i < count; i++, flag <<= 1) {
+	for (i = 0; i < (int)count; i++, flag <<= 1) {
 		if ((oldflags & flag) && custom_flags[i] != NULL) {
 			i_assert(*custom_flags[i] != '\0');
 
--- a/src/lib-index/mail-index-data.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-index/mail-index-data.c	Mon Nov 04 09:11:32 2002 +0200
@@ -430,7 +430,7 @@
 	if (pos < (int)sizeof(MailIndexDataHeader))
 		return index_data_set_corrupted(data, "Header is missing");
 
-	if (file_set_size(data->fd, new_fsize) < 0) {
+	if (file_set_size(data->fd, (off_t)new_fsize) < 0) {
 		if (errno == ENOSPC)
 			data->index->nodiskspace = TRUE;
 		return index_data_set_syscall_error(data, "file_set_size()");
--- a/src/lib-index/mail-index-update.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-index/mail-index-update.c	Mon Nov 04 09:11:32 2002 +0200
@@ -102,7 +102,7 @@
 	}
 }
 
-size_t get_max_align_size(size_t base, size_t extra, size_t *max_extra)
+static size_t get_max_align_size(size_t base, size_t extra, size_t *max_extra)
 {
 	size_t size;
 
@@ -335,19 +335,19 @@
 	switch (field) {
 	case DATA_HDR_INTERNAL_DATE:
 		i_assert(size == sizeof(time_t));
-		update->data_hdr.internal_date = *((time_t *) value);
+		update->data_hdr.internal_date = *((const time_t *) value);
 		break;
 	case DATA_HDR_VIRTUAL_SIZE:
 		i_assert(size == sizeof(uoff_t));
-		update->data_hdr.virtual_size = *((uoff_t *) value);
+		update->data_hdr.virtual_size = *((const uoff_t *) value);
 		break;
 	case DATA_HDR_HEADER_SIZE:
 		i_assert(size == sizeof(uoff_t));
-		update->data_hdr.header_size = *((uoff_t *) value);
+		update->data_hdr.header_size = *((const uoff_t *) value);
 		break;
 	case DATA_HDR_BODY_SIZE:
 		i_assert(size == sizeof(uoff_t));
-		update->data_hdr.body_size = *((uoff_t *) value);
+		update->data_hdr.body_size = *((const uoff_t *) value);
 		break;
 	default:
                 i_unreached();
--- a/src/lib-index/mail-modifylog.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-index/mail-modifylog.c	Mon Nov 04 09:11:32 2002 +0200
@@ -820,9 +820,9 @@
 	return TRUE;
 }
 
-void mail_modifylog_get_nonsynced_file(ModifyLogFile *file,
-				       const ModifyLogRecord **arr,
-				       unsigned int *count)
+static void mail_modifylog_get_nonsynced_file(ModifyLogFile *file,
+					      const ModifyLogRecord **arr,
+					      unsigned int *count)
 {
 	ModifyLogRecord *end_rec;
 
--- a/src/lib-mail/message-parser.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-mail/message-parser.c	Mon Nov 04 09:11:32 2002 +0200
@@ -390,9 +390,10 @@
 
 					/* and finally call the function */
 					func(part,
-					     (char*) msg + line_start, name_len,
-					     (char*) msg + colon_pos, value_len,
-					     context);
+					     (const char *) msg + line_start,
+					     name_len,
+					     (const char *) msg + colon_pos,
+					     value_len, context);
 				}
 
 				colon_pos = UINT_MAX;
--- a/src/lib-storage/index/mbox/mbox-expunge.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib-storage/index/mbox/mbox-expunge.c	Mon Nov 04 09:11:32 2002 +0200
@@ -138,7 +138,7 @@
 		(void)o_buffer_send_ibuffer(outbuf, inbuf);
 	}
 
-	if (ftruncate(ibox->index->mbox_fd, outbuf->offset) < 0) {
+	if (ftruncate(ibox->index->mbox_fd, (off_t)outbuf->offset) < 0) {
 		mail_storage_set_error(ibox->box.storage, "ftruncate() failed "
 				       "for mbox file %s: %m",
 				       ibox->index->mbox_path);
--- a/src/lib/ibuffer-mmap.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib/ibuffer-mmap.c	Mon Nov 04 09:11:32 2002 +0200
@@ -35,7 +35,7 @@
 
 	int fd;
 	void *mmap_base;
-	uoff_t mmap_offset;
+	off_t mmap_offset;
 	size_t mmap_block_size;
 
 	unsigned int autoclose_fd:1;
@@ -179,8 +179,8 @@
 
 	abs_offset = buf->ibuffer.start_offset + v_offset;
 	if (buf->buffer_size != 0 &&
-	    mbuf->mmap_offset <= abs_offset &&
-	    mbuf->mmap_offset + buf->buffer_size > abs_offset) {
+	    (uoff_t)mbuf->mmap_offset <= abs_offset &&
+	    (uoff_t)mbuf->mmap_offset + buf->buffer_size > abs_offset) {
 		/* already mmaped */
 		buf->skip = buf->pos = abs_offset - mbuf->mmap_offset;
 	} else {
--- a/src/lib/ibuffer.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib/ibuffer.c	Mon Nov 04 09:11:32 2002 +0200
@@ -171,7 +171,7 @@
 				_buf->w_buffer[i-1] = '\0';
 			else
 				_buf->w_buffer[i] = '\0';
-			ret_buf = (char *) _buf->buffer + _buf->skip;
+			ret_buf = (char *) _buf->w_buffer + _buf->skip;
 
 			i++;
 			buf->v_offset += i - _buf->skip;
--- a/src/lib/macros.h	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib/macros.h	Mon Nov 04 09:11:32 2002 +0200
@@ -38,7 +38,7 @@
 #define POINTER_CAST(i) \
 	((void *) ((char *) NULL + (i)))
 #define POINTER_CAST_TO(p, type) \
-	((type) ((char *) (p) - (char *) NULL))
+	((type) ((const char *) (p) - (const char *) NULL))
 
 /* Define VA_COPY() to do the right thing for copying va_list variables. */
 #ifndef VA_COPY
--- a/src/lib/md5.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib/md5.c	Mon Nov 04 09:11:32 2002 +0200
@@ -48,7 +48,7 @@
  */
 #if defined(__i386__) || defined(__vax__)
 #define SET(n) \
-	(*(MD5_u32plus *)&ptr[(n) * 4])
+	(*(const MD5_u32plus *)&ptr[(n) * 4])
 #define GET(n) \
 	SET(n)
 #else
@@ -205,7 +205,7 @@
 		}
 
 		memcpy(&ctx->buffer[used], data, free);
-		data = (unsigned char *) data + free;
+		data = (const unsigned char *) data + free;
 		size -= free;
 		body(ctx, ctx->buffer, 64);
 	}
--- a/src/lib/obuffer-file.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib/obuffer-file.c	Mon Nov 04 09:11:32 2002 +0200
@@ -292,7 +292,7 @@
 	return 1;
 }
 
-int _flush(_OBuffer *buf)
+static int _flush(_OBuffer *buf)
 {
 	FileOBuffer *fbuf = (FileOBuffer *) buf;
 	int ret;
--- a/src/lib/write-full.c	Mon Nov 04 08:29:06 2002 +0200
+++ b/src/lib/write-full.c	Mon Nov 04 09:11:32 2002 +0200
@@ -24,6 +24,7 @@
 */
 
 #include "lib.h"
+#include "write-full.h"
 
 #include <unistd.h>