[dovecot-cvs] dovecot/src/lib-index mail-custom-flags.c,1.12,1.13 mail-index-data.c,1.29,1.30 mail-index-update.c,1.32,1.33 mail-modifylog.c,1.33,1.34

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index
In directory danu:/tmp/cvs-serv21921/lib-index

Modified Files:
	mail-custom-flags.c mail-index-data.c mail-index-update.c 
	mail-modifylog.c 
Log Message:
Several minor fixes: signess, casting away const, missing static, etc.



Index: mail-custom-flags.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-custom-flags.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mail-custom-flags.c	23 Oct 2002 20:41:35 -0000	1.12
+++ mail-custom-flags.c	4 Nov 2002 07:11:32 -0000	1.13
@@ -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');
 

Index: mail-index-data.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-data.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mail-index-data.c	29 Oct 2002 05:22:12 -0000	1.29
+++ mail-index-data.c	4 Nov 2002 07:11:32 -0000	1.30
@@ -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()");

Index: mail-index-update.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-index-update.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- mail-index-update.c	3 Nov 2002 08:16:41 -0000	1.32
+++ mail-index-update.c	4 Nov 2002 07:11:32 -0000	1.33
@@ -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();

Index: mail-modifylog.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mail-modifylog.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- mail-modifylog.c	28 Oct 2002 09:31:40 -0000	1.33
+++ mail-modifylog.c	4 Nov 2002 07:11:32 -0000	1.34
@@ -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;