Fri Jan 13 22:26:20 EET 2006

Update of /var/lib/cvs/dovecot/src/lib-mail
In directory talvi:/tmp/cvs-serv27808/src/lib-mail

Modified Files:
	istream-header-filter.c istream-header-filter.h 
	message-address.c message-body-search.c message-body-search.h 
	message-content-parser.c message-content-parser.h 
	message-date.c message-date.h message-header-decode.c 
	message-header-decode.h message-header-search.c 
	message-header-search.h message-parser.c message-parser.h 
	message-part-serialize.c message-send.c message-send.h 
	message-size.c message-size.h 
Log Message:
Added "bool" type and changed all ints that were used as booleans to bool.



Index: istream-header-filter.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/istream-header-filter.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32

--- istream-header-filter.c	31 Dec 2005 17:31:54 -0000	1.31
+++ istream-header-filter.c	13 Jan 2006 20:26:16 -0000	1.32
@@ -63,7 +63,8 @@
 	struct message_header_line *hdr;
 	size_t pos;
 	ssize_t ret;
-	int matched, hdr_ret;
+	bool matched;
+	int hdr_ret;
 
 	if (mstream->header_read &&
 	    mstream->istream.istream.v_offset +
@@ -235,7 +236,7 @@
 }
 
 static void _seek(struct _istream *stream, uoff_t v_offset,
-		  int mark __attr_unused__)
+		  bool mark __attr_unused__)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -279,7 +280,7 @@
 }
 
 static const struct stat *
-_stat(struct _istream *stream, int exact __attr_unused__)
+_stat(struct _istream *stream, bool exact __attr_unused__)
 {
 	/* return size and others as unknown */
 	return &stream->statbuf;

Index: istream-header-filter.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/istream-header-filter.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- istream-header-filter.h	8 Apr 2005 12:14:42 -0000	1.7
+++ istream-header-filter.h	13 Jan 2006 20:26:16 -0000	1.8
@@ -16,7 +16,7 @@
 struct message_header_line;
 
 typedef void header_filter_callback(struct message_header_line *hdr,
-				    int *matched, void *context);
+				    bool *matched, void *context);
 
 /* NOTE: headers list must be sorted. */
 struct istream *

Index: message-address.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-address.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- message-address.c	13 Jul 2005 21:35:17 -0000	1.14
+++ message-address.c	13 Jan 2006 20:26:16 -0000	1.15
@@ -295,7 +295,7 @@
 
 void message_address_write(string_t *str, const struct message_address *addr)
 {
-	int first = TRUE, in_group = FALSE;
+	bool first = TRUE, in_group = FALSE;
 
 	/* a) mailbox at domain
 	   b) name <@route:mailbox at domain>

Index: message-body-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-body-search.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- message-body-search.c	31 Dec 2005 13:43:13 -0000	1.24
+++ message-body-search.c	13 Jan 2006 20:26:16 -0000	1.25
@@ -59,7 +59,7 @@
 static void
 parse_content_type_param(const unsigned char *name, size_t name_len,
 			 const unsigned char *value, size_t value_len,
-			 int value_quoted, void *context)
+			 bool value_quoted, void *context)
 {
 	struct part_search_context *ctx = context;
 
@@ -99,13 +99,14 @@
 	}
 }
 
-static int message_search_header(struct part_search_context *ctx,
-				 struct istream *input)
+static bool message_search_header(struct part_search_context *ctx,
+				  struct istream *input)
 {
 	struct header_search_context *hdr_search_ctx;
 	struct message_header_parser_ctx *hdr_ctx;
 	struct message_header_line *hdr;
-	int ret, found = FALSE;
+	int ret;
+	bool found = FALSE;
 
 	hdr_search_ctx = message_header_search_init(pool_datastack_create(),
 						    ctx->body_ctx->key,
@@ -159,8 +160,8 @@
 	return found;
 }
 
-static int message_search_decoded_block(struct part_search_context *ctx,
-					buffer_t *block)
+static bool message_search_decoded_block(struct part_search_context *ctx,
+					 buffer_t *block)
 {
 	const unsigned char *p, *end, *key;
 	size_t key_len, block_size, *matches, match_count, value;
@@ -267,16 +268,16 @@
 	return 0;
 }
 
-static int message_search_body(struct part_search_context *ctx,
-			       struct istream *input,
-			       const struct message_part *part)
+static bool message_search_body(struct part_search_context *ctx,
+				struct istream *input,
+				const struct message_part *part)
 {
 	const unsigned char *data;
 	buffer_t *decodebuf;
 	pool_t pool;
 	size_t data_size, pos;
 	ssize_t ret;
-	int found;
+	bool found;
 
 	if (ctx->content_unknown) {
 		/* unknown content-encoding-type, ignore */
@@ -353,9 +354,10 @@
 	return found;
 }
 
-static int message_body_search_init(struct body_search_context *ctx,
-				    const char *key, const char *charset,
-				    int *unknown_charset_r, int search_header)
+static bool
+message_body_search_init(struct body_search_context *ctx,
+			 const char *key, const char *charset,
+			 bool *unknown_charset_r, bool search_header)
 {
 	size_t key_len;
 
@@ -428,11 +430,12 @@
 
 int message_body_search(const char *key, const char *charset,
 			struct istream *input,
-			const struct message_part *part, int search_header,
+			const struct message_part *part, bool search_header,
                         enum message_body_search_error *error_r)
 {
         struct body_search_context ctx;
-	int ret, unknown_charset;
+	int ret;
+	bool unknown_charset;
 
 	if (!message_body_search_init(&ctx, key, charset, &unknown_charset,
 				      search_header)) {

Index: message-body-search.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-body-search.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- message-body-search.h	31 Dec 2005 13:43:13 -0000	1.6
+++ message-body-search.h	13 Jan 2006 20:26:16 -0000	1.7
@@ -17,7 +17,7 @@
    is compared to message data without any translation. */
 int message_body_search(const char *key, const char *charset,
 			struct istream *input,
-			const struct message_part *part, int search_header,
+			const struct message_part *part, bool search_header,
                         enum message_body_search_error *error_r);
 
 #endif

Index: message-content-parser.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-content-parser.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- message-content-parser.c	13 Jun 2005 08:45:57 -0000	1.12
+++ message-content-parser.c	13 Jan 2006 20:26:16 -0000	1.13
@@ -13,7 +13,7 @@
 	struct rfc822_parser_context parser;
 	string_t *str;
 	size_t key_len;
-	int quoted_string;
+	bool quoted_string;
 
 	rfc822_parser_init(&parser, data, size, NULL);
 

Index: message-content-parser.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-content-parser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- message-content-parser.h	27 Jan 2003 02:00:00 -0000	1.7
+++ message-content-parser.h	13 Jan 2006 20:26:16 -0000	1.8
@@ -8,7 +8,7 @@
 					    size_t name_len,
 					    const unsigned char *value,
 					    size_t value_len,
-					    int value_quoted, void *context);
+					    bool value_quoted, void *context);
 
 void message_content_parse_header(const unsigned char *data, size_t size,
 				  parse_content_callback_t *callback,

Index: message-date.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-date.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- message-date.c	5 Jun 2005 20:07:20 -0000	1.11
+++ message-date.c	13 Jan 2006 20:26:16 -0000	1.12
@@ -105,8 +105,8 @@
 	return ret < 0 ? -1 : *value_len > 0;
 }
 
-static int message_date_parser_tokens(struct message_date_parser_context *ctx,
-				      time_t *time, int *timezone_offset)
+static bool message_date_parser_tokens(struct message_date_parser_context *ctx,
+				       time_t *time, int *timezone_offset)
 {
 	struct tm tm;
 	const unsigned char *value;
@@ -228,32 +228,33 @@
 	return TRUE;
 }
 
-int message_date_parse(const unsigned char *data, size_t size,
+bool message_date_parse(const unsigned char *data, size_t size,
 		       time_t *time, int *timezone_offset)
 {
 	struct message_date_parser_context ctx;
-	int ret;
+	bool success;
 
 	t_push();
 	rfc822_parser_init(&ctx.parser, data, size, NULL);
 	ctx.str = t_str_new(128);
-	ret = message_date_parser_tokens(&ctx, time, timezone_offset);
+	success = message_date_parser_tokens(&ctx, time, timezone_offset);
 	t_pop();
 
-	return ret;
+	return success;
 }
 
 const char *message_date_create(time_t time)
 {
 	struct tm *tm;
-	int offset, negative;
+	int offset;
+	bool negative;
 
 	tm = localtime(&time);
 	offset = utc_offset(tm, time);
 	if (offset >= 0)
-		negative = 0;
+		negative = FALSE;
 	else {
-		negative = 1;
+		negative = TRUE;
 		offset = -offset;
 	}
 

Index: message-date.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-date.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- message-date.h	20 Jan 2003 14:52:51 -0000	1.2
+++ message-date.h	13 Jan 2006 20:26:16 -0000	1.3
@@ -3,8 +3,8 @@
 
 /* Parses RFC2822 date/time string. timezone_offset is filled with the
    timezone's difference to UTC in minutes. */
-int message_date_parse(const unsigned char *data, size_t size,
-		       time_t *time, int *timezone_offset);
+bool message_date_parse(const unsigned char *data, size_t size,
+			time_t *time, int *timezone_offset);
 
 /* Create RFC2822 date/time string from given time in local timezone. */
 const char *message_date_create(time_t time);

Index: message-header-decode.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-header-decode.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- message-header-decode.c	21 Sep 2003 16:21:37 -0000	1.5
+++ message-header-decode.c	13 Jan 2006 20:26:16 -0000	1.6
@@ -6,9 +6,9 @@
 #include "quoted-printable.h"
 #include "message-header-decode.h"
 
-static int split_encoded(const unsigned char *data, size_t *size_p,
-			 const char **charset, const char **encoding,
-			 const unsigned char **text, size_t *text_size_r)
+static bool split_encoded(const unsigned char *data, size_t *size_p,
+			  const char **charset, const char **encoding,
+			  const unsigned char **text, size_t *text_size_r)
 {
 	size_t size, pos, textpos;
 
@@ -44,7 +44,7 @@
 	return TRUE;
 }
 
-static int
+static bool
 message_header_decode_encoded(const unsigned char *data, size_t *size,
 			      message_header_decode_callback_t *callback,
 			      void *context)

Index: message-header-decode.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-header-decode.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- message-header-decode.h	27 Jan 2003 02:00:00 -0000	1.3
+++ message-header-decode.h	13 Jan 2006 20:26:16 -0000	1.4
@@ -3,9 +3,9 @@
 
 /* Return FALSE if you wish to stop decoding. charset is NULL when it's not
    RFC2047-encoded. */
-typedef int message_header_decode_callback_t(const unsigned char *data,
-					     size_t size, const char *charset,
-					     void *context);
+typedef bool message_header_decode_callback_t(const unsigned char *data,
+					      size_t size, const char *charset,
+					      void *context);
 
 /* Decode RFC2047 encoded words. Call specified function for each
    decoded block. */

Index: message-header-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-header-search.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- message-header-search.c	11 Sep 2005 13:23:01 -0000	1.15
+++ message-header-search.c	13 Jan 2006 20:26:16 -0000	1.16
@@ -32,7 +32,7 @@
 
 struct header_search_context *
 message_header_search_init(pool_t pool, const char *key, const char *charset,
-			   int *unknown_charset)
+			   bool *unknown_charset)
 {
 	struct header_search_context *ctx;
 	size_t key_len;
@@ -121,7 +121,7 @@
 	size_t pos, *matches, match_count, value;
 	ssize_t i;
 	unsigned char chr;
-	int last_newline;
+	bool last_newline;
 
 	matches = buffer_get_modifyable_data(ctx->match_buf, &match_count);
 	match_count /= sizeof(size_t);
@@ -188,8 +188,8 @@
 	ctx->last_newline = last_newline;
 }
 
-static int search_block(const unsigned char *data, size_t size,
-			const char *charset, void *context)
+static bool search_block(const unsigned char *data, size_t size,
+			 const char *charset, void *context)
 {
 	struct header_search_context *ctx = context;
 
@@ -205,8 +205,8 @@
 	return !ctx->found;
 }
 
-int message_header_search(const unsigned char *header_block, size_t size,
-			  struct header_search_context *ctx)
+bool message_header_search(const unsigned char *header_block, size_t size,
+			   struct header_search_context *ctx)
 {
 	if (!ctx->found)
 		message_header_decode(header_block, size, search_block, ctx);

Index: message-header-search.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-header-search.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- message-header-search.h	5 Jan 2003 13:09:52 -0000	1.4
+++ message-header-search.h	13 Jan 2006 20:26:16 -0000	1.5
@@ -7,7 +7,7 @@
    valid in specified charset. */
 struct header_search_context *
 message_header_search_init(pool_t pool, const char *key, const char *charset,
-			   int *unknown_charset);
+			   bool *unknown_charset);
 
 /* Free search context. Not needed if you just destroy the pool. */
 void message_header_search_free(struct header_search_context *ctx);
@@ -15,8 +15,8 @@
 /* Returns TRUE if key is found from header. This function may be called
    multiple times with partial header blocks, but the blocks must contain only
    full lines so RFC2047 parsing can be done. */
-int message_header_search(const unsigned char *header_block, size_t size,
-			  struct header_search_context *ctx);
+bool message_header_search(const unsigned char *header_block, size_t size,
+			   struct header_search_context *ctx);
 
 /* Next call to message_header_search() will begin a new header. */
 void message_header_search_reset(struct header_search_context *ctx);

Index: message-parser.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-parser.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- message-parser.c	27 Oct 2005 12:11:11 -0000	1.69
+++ message-parser.c	13 Jan 2006 20:26:16 -0000	1.70
@@ -41,8 +41,8 @@
 	buffer_t *value_buf;
 	size_t skip;
 
-	int skip_initial_lwsp;
-	int has_nuls;
+	bool skip_initial_lwsp;
+	bool has_nuls;
 };
 
 static void
@@ -54,12 +54,12 @@
 static struct message_part *
 message_parse_body(struct message_parser_ctx *parser_ctx,
 		   struct message_boundary *boundaries,
-		   struct message_size *msg_size, int *has_nuls);
+		   struct message_size *msg_size, bool *has_nuls);
 
 static struct message_part *
 message_skip_boundary(struct message_parser_ctx *parser_ctx,
 		      struct message_boundary *boundaries,
-		      struct message_size *boundary_size, int *has_nuls);
+		      struct message_size *boundary_size, bool *has_nuls);
 
 static void message_size_add_part(struct message_size *dest,
 				  struct message_part *part)
@@ -125,7 +125,7 @@
 static void
 parse_content_type_param(const unsigned char *name, size_t name_len,
 			 const unsigned char *value, size_t value_len,
-			 int value_quoted, void *context)
+			 bool value_quoted, void *context)
 {
 	struct message_parser_ctx *parser_ctx = context;
 
@@ -146,7 +146,7 @@
 {
 	struct message_part *parent_part, *next_part, *part;
 	struct message_boundary *b;
-	int has_nuls;
+	bool has_nuls;
 
 	/* multipart message. add new boundary */
 	b = p_new(parser_ctx->parser_pool, struct message_boundary, 1);
@@ -263,7 +263,7 @@
 {
 	struct message_part *part = parser_ctx->part;
         struct message_part *next_part;
-	int has_nuls;
+	bool has_nuls;
 
 	if (parser_ctx->last_boundary != NULL)
 		return message_parse_multipart(parser_ctx);
@@ -317,8 +317,8 @@
 }
 
 static void message_skip_line(struct istream *input,
-			      struct message_size *msg_size, int skip_lf,
-			      int *has_nuls)
+			      struct message_size *msg_size, bool skip_lf,
+			      bool *has_nuls)
 {
 	const unsigned char *msg;
 	size_t i, size, startpos;
@@ -386,7 +386,7 @@
 static struct message_boundary *
 message_find_boundary(struct istream *input,
 		      struct message_boundary *boundaries,
-		      struct message_size *msg_size, int *has_nuls)
+		      struct message_size *msg_size, bool *has_nuls)
 {
 	struct message_boundary *boundary;
 	const unsigned char *msg;
@@ -499,7 +499,7 @@
 static struct message_part *
 message_parse_body(struct message_parser_ctx *parser_ctx,
 		   struct message_boundary *boundaries,
-		   struct message_size *msg_size, int *has_nuls)
+		   struct message_size *msg_size, bool *has_nuls)
 {
 	struct message_boundary *boundary;
 	struct message_size body_size;
@@ -521,7 +521,7 @@
 static struct message_part *
 message_skip_boundary(struct message_parser_ctx *parser_ctx,
 		      struct message_boundary *boundaries,
-		      struct message_size *boundary_size, int *has_nuls)
+		      struct message_size *boundary_size, bool *has_nuls)
 {
 	struct message_boundary *boundary;
 	const unsigned char *msg;
@@ -666,7 +666,7 @@
 
 struct message_header_parser_ctx *
 message_parse_header_init(struct istream *input, struct message_size *hdr_size,
-			  int skip_initial_lwsp)
+			  bool skip_initial_lwsp)
 {
 	struct message_header_parser_ctx *ctx;
 
@@ -696,7 +696,8 @@
         struct message_header_line *line = &ctx->line;
 	const unsigned char *msg;
 	size_t i, size, startpos, colon_pos, parse_size;
-	int ret, last_no_newline;
+	int ret;
+	bool last_no_newline;
 
 	*hdr_r = NULL;
 	if (line->eoh)

Index: message-parser.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-parser.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- message-parser.h	7 Aug 2005 11:41:21 -0000	1.28
+++ message-parser.h	13 Jan 2006 20:26:16 -0000	1.29
@@ -105,7 +105,7 @@
    struct message_header_line. */
 struct message_header_parser_ctx *
 message_parse_header_init(struct istream *input, struct message_size *hdr_size,
-			 int skip_initial_lwsp);
+			 bool skip_initial_lwsp);
 void message_parse_header_deinit(struct message_header_parser_ctx *ctx);
 
 /* Read and return next header line. Returns 1 if header is returned, 0 if

Index: message-part-serialize.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-part-serialize.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- message-part-serialize.c	28 Oct 2005 13:38:22 -0000	1.22
+++ message-part-serialize.c	13 Jan 2006 20:26:16 -0000	1.23
@@ -44,7 +44,7 @@
 {
 	unsigned int count, children_count;
 	size_t children_offset;
-	int root = part->parent == NULL;
+	bool root = part->parent == NULL;
 
 	count = 0;
 	while (part != NULL) {
@@ -103,8 +103,8 @@
 	_message_part_serialize(part, dest);
 }
 
-static int read_next(struct deserialize_context *ctx,
-		     void *buffer, size_t buffer_size)
+static bool read_next(struct deserialize_context *ctx,
+		      void *buffer, size_t buffer_size)
 {
 	if (ctx->data + buffer_size > ctx->end) {
 		ctx->error = "Not enough data";
@@ -116,15 +116,16 @@
 	return TRUE;
 }
 
-static int message_part_deserialize_part(struct deserialize_context *ctx,
-					 struct message_part *parent,
-					 unsigned int siblings,
-                                         struct message_part **part_r)
+static bool
+message_part_deserialize_part(struct deserialize_context *ctx,
+			      struct message_part *parent,
+			      unsigned int siblings,
+			      struct message_part **part_r)
 {
 	struct message_part *part, *first_part, **next_part;
 	unsigned int children_count;
 	uoff_t pos;
-	int root = parent == NULL;
+	bool root = parent == NULL;
 
 	first_part = NULL;
 	next_part = NULL;

Index: message-send.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-send.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- message-send.c	15 Aug 2004 03:40:31 -0000	1.23
+++ message-send.c	13 Jan 2006 20:26:16 -0000	1.24
@@ -9,7 +9,7 @@
 
 void message_skip_virtual(struct istream *input, uoff_t virtual_skip,
 			  struct message_size *msg_size,
-			  int cr_skipped, int *last_cr)
+			  bool cr_skipped, bool *last_cr)
 {
 	const unsigned char *msg;
 	size_t i, size, startpos;

Index: message-send.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-send.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- message-send.h	15 Aug 2004 03:40:31 -0000	1.13
+++ message-send.h	13 Jan 2006 20:26:16 -0000	1.14
@@ -9,6 +9,6 @@
    that next character should be \n and you shouldn't treat it as \r\n. */
 void message_skip_virtual(struct istream *input, uoff_t virtual_skip,
 			  struct message_size *msg_size,
-			  int cr_skipped, int *last_cr);
+			  bool cr_skipped, bool *last_cr);
 
 #endif

Index: message-size.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-size.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- message-size.c	4 Jun 2003 23:00:44 -0000	1.14
+++ message-size.c	13 Jan 2006 20:26:16 -0000	1.15
@@ -6,7 +6,7 @@
 #include "message-size.h"
 
 void message_get_header_size(struct istream *input, struct message_size *hdr,
-			     int *has_nuls)
+			     bool *has_nuls)
 {
 	const unsigned char *msg;
 	size_t i, size, startpos, missing_cr_count;
@@ -62,11 +62,11 @@
 }
 
 void message_get_body_size(struct istream *input, struct message_size *body,
-			   int *has_nuls)
+			   bool *has_nuls)
 {
 	const unsigned char *msg;
 	size_t i, size, missing_cr_count;
-	int last_cr;
+	bool last_cr;
 
 	memset(body, 0, sizeof(struct message_size));
 	if (has_nuls != NULL)

Index: message-size.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-size.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- message-size.h	4 Jun 2003 23:00:44 -0000	1.12
+++ message-size.h	13 Jan 2006 20:26:16 -0000	1.13
@@ -10,10 +10,10 @@
 /* Calculate size of message header. Leave the input point to first
    character in body. */
 void message_get_header_size(struct istream *input, struct message_size *hdr,
-			     int *has_nuls);
+			     bool *has_nuls);
 /* Calculate size of message body. */
 void message_get_body_size(struct istream *input, struct message_size *body,
-			   int *has_nuls);
+			   bool *has_nuls);
 
 /* Sum contents of src into dest. */
 void message_size_add(struct message_size *dest,

