[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-copy.c, 1.41, 1.42 maildir-list.c, 1.36, 1.37 maildir-mail.c, 1.18, 1.19 maildir-save.c, 1.62, 1.63 maildir-storage.c, 1.106, 1.107 maildir-storage.h, 1.43, 1.44 maildir-sync.c, 1.70, 1.71 maildir-uidlist.c, 1.41, 1.42 maildir-uidlist.h, 1.15, 1.16

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv27808/src/lib-storage/index/maildir

Modified Files:
	maildir-copy.c maildir-list.c maildir-mail.c maildir-save.c 
	maildir-storage.c maildir-storage.h maildir-sync.c 
	maildir-uidlist.c maildir-uidlist.h 
Log Message:
Added "bool" type and changed all ints that were used as booleans to bool.



Index: maildir-copy.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-copy.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- maildir-copy.c	30 Dec 2005 19:12:46 -0000	1.41
+++ maildir-copy.c	13 Jan 2006 20:26:35 -0000	1.42
@@ -14,7 +14,7 @@
 
 struct maildir_copy_context {
 	struct maildir_mailbox *mbox;
-	int hardlink;
+	bool hardlink;
 
         struct maildir_uidlist_sync_ctx *uidlist_sync_ctx;
 	struct maildir_keywords_sync_ctx *keywords_sync_ctx;
@@ -25,7 +25,7 @@
 
 struct hardlink_ctx {
 	const char *dest_path;
-	int found;
+	bool found;
 };
 
 struct rollback {

Index: maildir-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-list.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- maildir-list.c	21 Jul 2005 19:16:30 -0000	1.36
+++ maildir-list.c	13 Jan 2006 20:26:35 -0000	1.37
@@ -29,10 +29,10 @@
 	size_t parent_pos;
 	struct mailbox_node *root, *next_node;
 	struct mailbox_list list;
-	int failed;
+	bool failed;
 };
 
-static void maildir_nodes_fix(struct mailbox_node *node, int is_subs)
+static void maildir_nodes_fix(struct mailbox_node *node, bool is_subs)
 {
 	while (node != NULL) {
 		if (node->children != NULL) {
@@ -49,8 +49,9 @@
 	}
 }
 
-static int maildir_fill_readdir(struct maildir_list_context *ctx,
-				struct imap_match_glob *glob, int update_only)
+static bool
+maildir_fill_readdir(struct maildir_list_context *ctx,
+		     struct imap_match_glob *glob, bool update_only)
 {
 	DIR *dirp;
 	struct dirent *d;
@@ -59,7 +60,7 @@
 	string_t *mailbox;
 	enum imap_match_result match;
 	struct mailbox_node *node;
-	int stat_dirs, created, hide;
+	bool stat_dirs, created, hide;
 
 	dirp = opendir(ctx->dir);
 	if (dirp == NULL) {
@@ -196,15 +197,15 @@
 	return TRUE;
 }
 
-static int maildir_fill_subscribed(struct maildir_list_context *ctx,
-				   struct imap_match_glob *glob)
+static bool maildir_fill_subscribed(struct maildir_list_context *ctx,
+				    struct imap_match_glob *glob)
 {
 	struct maildir_storage *storage =
 		(struct maildir_storage *)ctx->mailbox_ctx.storage;
 	struct subsfile_list_context *subsfile_ctx;
 	const char *path, *name, *p;
 	struct mailbox_node *node;
-	int created;
+	bool created;
 
 	path = t_strconcat(storage->control_dir != NULL ?
 			   storage->control_dir : INDEX_STORAGE(storage)->dir,
@@ -303,7 +304,7 @@
 
 	if ((flags & MAILBOX_LIST_SUBSCRIBED) == 0 ||
 	    (ctx->flags & MAILBOX_LIST_FAST_FLAGS) == 0) {
-		int update_only = (flags & MAILBOX_LIST_SUBSCRIBED) != 0;
+		bool update_only = (flags & MAILBOX_LIST_SUBSCRIBED) != 0;
 		if (!maildir_fill_readdir(ctx, glob, update_only)) {
 			ctx->failed = TRUE;
 			return &ctx->mailbox_ctx;

Index: maildir-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-mail.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- maildir-mail.c	3 Jul 2005 13:07:53 -0000	1.18
+++ maildir-mail.c	13 Jan 2006 20:26:35 -0000	1.19
@@ -42,7 +42,7 @@
 }
 
 static struct istream *
-maildir_open_mail(struct maildir_mailbox *mbox, uint32_t uid, int *deleted)
+maildir_open_mail(struct maildir_mailbox *mbox, uint32_t uid, bool *deleted)
 {
 	int fd;
 
@@ -223,7 +223,7 @@
 	struct index_mail *mail = (struct index_mail *)_mail;
 	struct maildir_mailbox *mbox = (struct maildir_mailbox *)mail->ibox;
 	struct index_mail_data *data = &mail->data;
-	int deleted;
+	bool deleted;
 
 	if (data->stream == NULL) {
 		data->stream = maildir_open_mail(mbox,

Index: maildir-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-save.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- maildir-save.c	30 Dec 2005 19:12:46 -0000	1.62
+++ maildir-save.c	13 Jan 2006 20:26:35 -0000	1.63
@@ -120,7 +120,7 @@
 		  enum mail_flags flags, struct mail_keywords *keywords,
 		  time_t received_date, int timezone_offset __attr_unused__,
 		  const char *from_envelope __attr_unused__,
-		  struct istream *input, int want_mail)
+		  struct istream *input, bool want_mail)
 {
 	struct maildir_transaction_context *t =
 		(struct maildir_transaction_context *)_t;

Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- maildir-storage.c	19 Nov 2005 12:42:56 -0000	1.106
+++ maildir-storage.c	13 Jan 2006 20:26:35 -0000	1.107
@@ -19,7 +19,7 @@
 #define CREATE_MODE 0770 /* umask() should limit it more */
 
 struct rename_context {
-	int found;
+	bool found;
 	size_t oldnamelen;
 	const char *newname;
 };
@@ -36,7 +36,7 @@
 	       enum mail_storage_flags flags,
 	       enum mail_storage_lock_method lock_method)
 {
-	int debug = (flags & MAIL_STORAGE_FLAG_DEBUG) != 0;
+	bool debug = (flags & MAIL_STORAGE_FLAG_DEBUG) != 0;
 	struct maildir_storage *storage;
 	struct index_storage *istorage;
 	const char *root_dir, *inbox_dir, *index_dir, *control_dir;
@@ -150,9 +150,9 @@
 	pool_unref(storage->storage.pool);
 }
 
-static int maildir_autodetect(const char *data, enum mail_storage_flags flags)
+static bool maildir_autodetect(const char *data, enum mail_storage_flags flags)
 {
-	int debug = (flags & MAIL_STORAGE_FLAG_DEBUG) != 0;
+	bool debug = (flags & MAIL_STORAGE_FLAG_DEBUG) != 0;
 	struct stat st;
 	const char *path;
 
@@ -173,8 +173,8 @@
 	return TRUE;
 }
 
-static int maildir_is_valid_create_name(struct mail_storage *storage,
-					const char *name)
+static bool maildir_is_valid_create_name(struct mail_storage *storage,
+					 const char *name)
 {
 	size_t len;
 
@@ -193,8 +193,8 @@
 	return TRUE;
 }
 
-static int maildir_is_valid_existing_name(struct mail_storage *storage,
-					  const char *name)
+static bool maildir_is_valid_existing_name(struct mail_storage *storage,
+					   const char *name)
 {
 	if (name[0] == '\0' || name[strlen(name)-1] == '/')
 		return FALSE;
@@ -208,7 +208,7 @@
 	return TRUE;
 }
 
-static const char *maildir_get_absolute_path(const char *name, int unlink)
+static const char *maildir_get_absolute_path(const char *name, bool unlink)
 {
 	const char *p;
 
@@ -279,7 +279,7 @@
 }
 
 static int mkdir_verify(struct index_storage *storage,
-			const char *dir, int verify)
+			const char *dir, bool verify)
 {
 	struct stat st;
 
@@ -308,7 +308,7 @@
 
 /* create or fix maildir, ignore if it already exists */
 static int create_maildir(struct index_storage *storage,
-			  const char *dir, int verify)
+			  const char *dir, bool verify)
 {
 	const char **tmp, *path;
 
@@ -394,7 +394,7 @@
 	return 0;
 }
 
-static int maildir_is_recent(struct index_mailbox *ibox, uint32_t uid)
+static bool maildir_is_recent(struct index_mailbox *ibox, uint32_t uid)
 {
 	struct maildir_mailbox *mbox = (struct maildir_mailbox *)ibox;
 
@@ -537,7 +537,7 @@
 
 static int maildir_mailbox_create(struct mail_storage *_storage,
 				  const char *name,
-				  int directory __attr_unused__)
+				  bool directory __attr_unused__)
 {
 	struct index_storage *storage = (struct index_storage *)_storage;
 	struct stat st;
@@ -729,7 +729,8 @@
 {
 	struct index_storage *storage = (struct index_storage *)_storage;
 	const char *oldpath, *newpath;
-	int ret, found;
+	int ret;
+        bool found;
 
 	mail_storage_clear_error(_storage);
 
@@ -779,7 +780,7 @@
 }
 
 static int maildir_set_subscribed(struct mail_storage *_storage,
-				  const char *name, int set)
+				  const char *name, bool set)
 {
 	struct maildir_storage *storage = (struct maildir_storage *)_storage;
 	const char *path;

Index: maildir-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- maildir-storage.h	30 Dec 2005 19:12:46 -0000	1.43
+++ maildir-storage.h	13 Jan 2006 20:26:35 -0000	1.44
@@ -103,7 +103,7 @@
 maildir_sync_index_begin(struct maildir_mailbox *mbox);
 void maildir_sync_index_abort(struct maildir_index_sync_context *sync_ctx);
 int maildir_sync_index_finish(struct maildir_index_sync_context *sync_ctx,
-			      int partial);
+			      bool partial);
 
 struct mailbox_transaction_context *
 maildir_transaction_begin(struct mailbox *box,
@@ -117,7 +117,7 @@
 		  enum mail_flags flags, struct mail_keywords *keywords,
 		  time_t received_date, int timezone_offset,
 		  const char *from_envelope, struct istream *input,
-		  int want_mail);
+		  bool want_mail);
 int maildir_save_continue(struct mail_save_context *ctx);
 int maildir_save_finish(struct mail_save_context *ctx, struct mail *dest_mail);
 void maildir_save_cancel(struct mail_save_context *ctx);

Index: maildir-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-sync.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- maildir-sync.c	6 Jan 2006 14:50:35 -0000	1.70
+++ maildir-sync.c	13 Jan 2006 20:26:35 -0000	1.71
@@ -201,7 +201,7 @@
 struct maildir_sync_context {
         struct maildir_mailbox *mbox;
 	const char *new_dir, *cur_dir;
-	int partial;
+	bool partial;
 
 	struct maildir_uidlist_sync_ctx *uidlist_sync_ctx;
         struct maildir_index_sync_context *index_sync_ctx;
@@ -464,7 +464,7 @@
 	struct mail_index_sync_rec *recs;
 	unsigned int i, count;
 	uint32_t seq, uid;
-	int expunged, flag_changed;
+	bool expunged, flag_changed;
 
 	recs = array_get_modifyable(&ctx->sync_recs, &count);
 	for (seq = recs[0].uid1; seq <= last_seq; seq++) {
@@ -636,7 +636,7 @@
 	return ret;
 }
 
-static int maildir_scan_dir(struct maildir_sync_context *ctx, int new_dir)
+static int maildir_scan_dir(struct maildir_sync_context *ctx, bool new_dir)
 {
 	struct mail_storage *storage = STORAGE(ctx->mbox->storage);
 	const char *dir;
@@ -645,7 +645,8 @@
 	struct dirent *dp;
 	enum maildir_uidlist_rec_flag flags;
 	unsigned int moves = 0;
-	int move_new, ret = 1;
+	int ret = 1;
+	bool move_new;
 
 	dir = new_dir ? ctx->new_dir : ctx->cur_dir;
 	dirp = opendir(dir);
@@ -756,7 +757,7 @@
 static int
 maildir_sync_quick_check(struct maildir_mailbox *mbox,
 			 const char *new_dir, const char *cur_dir,
-			 int *new_changed_r, int *cur_changed_r)
+			 bool *new_changed_r, bool *cur_changed_r)
 {
 	struct stat st;
 	time_t new_mtime, cur_mtime;
@@ -845,7 +846,7 @@
 }
 
 int maildir_sync_index_finish(struct maildir_index_sync_context *sync_ctx,
-			      int partial)
+			      bool partial)
 {
 	struct maildir_mailbox *mbox = sync_ctx->mbox;
 	struct mail_index_view *view = sync_ctx->view;
@@ -862,7 +863,8 @@
 	uint32_t uid_validity, next_uid;
 	uint64_t value;
 	time_t old_new_sync_time;
-	int ret = 0, full_rescan = FALSE;
+	int ret = 0;
+	bool full_rescan = FALSE;
 
 	i_assert(maildir_uidlist_is_locked(sync_ctx->mbox->uidlist));
 
@@ -1164,11 +1166,11 @@
 	return ret < 0 ? -1 : (full_rescan ? 0 : 1);
 }
 
-static int maildir_sync_context(struct maildir_sync_context *ctx, int forced,
-				int sync_last_commit)
+static int maildir_sync_context(struct maildir_sync_context *ctx, bool forced,
+				bool sync_last_commit)
 {
-	int ret, new_changed, cur_changed;
-	int full_rescan = FALSE;
+	bool new_changed, cur_changed, full_rescan = FALSE;
+	int ret;
 
 	if (sync_last_commit) {
 		new_changed = cur_changed = FALSE;
@@ -1344,7 +1346,8 @@
 int maildir_sync_is_synced(struct maildir_mailbox *mbox)
 {
 	const char *new_dir, *cur_dir;
-	int ret, new_changed, cur_changed;
+	bool new_changed, cur_changed;
+	int ret;
 
 	t_push();
 	new_dir = t_strconcat(mbox->path, "/new", NULL);

Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- maildir-uidlist.c	14 Aug 2005 21:54:25 -0000	1.41
+++ maildir-uidlist.c	13 Jan 2006 20:26:35 -0000	1.42
@@ -73,7 +73,7 @@
 };
 
 static int maildir_uidlist_lock_timeout(struct maildir_uidlist *uidlist,
-					int nonblock)
+					bool nonblock)
 {
 	const char *path;
 	mode_t old_mask;
@@ -118,7 +118,7 @@
 	return maildir_uidlist_lock_timeout(uidlist, TRUE);
 }
 
-int maildir_uidlist_is_locked(struct maildir_uidlist *uidlist)
+bool maildir_uidlist_is_locked(struct maildir_uidlist *uidlist)
 {
 	return UIDLIST_IS_LOCKED(uidlist);
 }
@@ -391,7 +391,7 @@
 	return rec->filename;
 }
 
-int maildir_uidlist_is_recent(struct maildir_uidlist *uidlist, uint32_t uid)
+bool maildir_uidlist_is_recent(struct maildir_uidlist *uidlist, uint32_t uid)
 {
 	enum maildir_uidlist_rec_flag flags;
 
@@ -562,7 +562,7 @@
 }
 
 static void maildir_uidlist_mark_all(struct maildir_uidlist *uidlist,
-				     int nonsynced)
+				     bool nonsynced)
 {
 	struct maildir_uidlist_rec **rec_p;
 	size_t i, size;
@@ -579,7 +579,7 @@
 	}
 }
 
-int maildir_uidlist_sync_init(struct maildir_uidlist *uidlist, int partial,
+int maildir_uidlist_sync_init(struct maildir_uidlist *uidlist, bool partial,
 			      struct maildir_uidlist_sync_ctx **sync_ctx_r)
 {
 	struct maildir_uidlist_sync_ctx *ctx;
@@ -826,7 +826,7 @@
 
 int maildir_uidlist_sync_deinit(struct maildir_uidlist_sync_ctx *ctx)
 {
-	int unlocked = FALSE;
+	bool unlocked = FALSE;
 	int ret = ctx->failed ? -1 : 0;
 
 	if (!ctx->finished)

Index: maildir-uidlist.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- maildir-uidlist.h	14 Aug 2005 19:02:54 -0000	1.15
+++ maildir-uidlist.h	13 Jan 2006 20:26:35 -0000	1.16
@@ -16,7 +16,7 @@
 int maildir_uidlist_lock(struct maildir_uidlist *uidlist);
 int maildir_uidlist_try_lock(struct maildir_uidlist *uidlist);
 void maildir_uidlist_unlock(struct maildir_uidlist *uidlist);
-int maildir_uidlist_is_locked(struct maildir_uidlist *uidlist);
+bool maildir_uidlist_is_locked(struct maildir_uidlist *uidlist);
 
 struct maildir_uidlist *maildir_uidlist_init(struct maildir_mailbox *mbox);
 void maildir_uidlist_deinit(struct maildir_uidlist *uidlist);
@@ -29,7 +29,7 @@
 maildir_uidlist_lookup(struct maildir_uidlist *uidlist, uint32_t uid,
 		       enum maildir_uidlist_rec_flag *flags_r);
 /* Returns TRUE if mail with given UID is recent. */
-int maildir_uidlist_is_recent(struct maildir_uidlist *uidlist, uint32_t uid);
+bool maildir_uidlist_is_recent(struct maildir_uidlist *uidlist, uint32_t uid);
 /* Returns number of recent messages. */
 uint32_t maildir_uidlist_get_recent_count(struct maildir_uidlist *uidlist);
 
@@ -41,7 +41,7 @@
 
 /* Sync uidlist with what's actually on maildir. Returns same as
    maildir_uidlist_lock(). */
-int maildir_uidlist_sync_init(struct maildir_uidlist *uidlist, int partial,
+int maildir_uidlist_sync_init(struct maildir_uidlist *uidlist, bool partial,
 			      struct maildir_uidlist_sync_ctx **sync_ctx_r);
 /* Returns 1 = ok, -1 = error, 0 = new file and dovecot-uidlist is locked */
 int maildir_uidlist_sync_next_pre(struct maildir_uidlist_sync_ctx *ctx,