[dovecot-cvs] dovecot/src/lib-storage/index/dbox dbox-list.c, 1.1, 1.2 dbox-mail.c, 1.3, 1.4 dbox-save.c, 1.1, 1.2 dbox-storage.c, 1.3, 1.4 dbox-storage.h, 1.4, 1.5 dbox-sync-expunge.c, 1.3, 1.4 dbox-sync.c, 1.3, 1.4 dbox-sync.h, 1.3, 1.4 dbox-uidlist.c, 1.11, 1.12

[cras at dovecot.org]

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

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



Index: dbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-list.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbox-list.c	27 Nov 2005 23:05:29 -0000	1.1
+++ dbox-list.c	13 Jan 2006 20:26:29 -0000	1.2
@@ -26,7 +26,7 @@
 	struct imap_match_glob *glob;
 	struct subsfile_list_context *subsfile_ctx;
 
-	int failed, inbox_found;
+	bool failed, inbox_found;
 
 	struct mailbox_list *(*next)(struct dbox_list_context *ctx);
 
@@ -63,7 +63,7 @@
 }
 
 static int list_opendir(struct mail_storage *storage,
-			const char *path, int root, DIR **dirp)
+			const char *path, bool root, DIR **dirp)
 {
 	*dirp = opendir(*path == '\0' ? "/" : path);
 	if (*dirp != NULL)

Index: dbox-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-mail.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbox-mail.c	11 Jan 2006 19:36:50 -0000	1.3
+++ dbox-mail.c	13 Jan 2006 20:26:29 -0000	1.4
@@ -51,7 +51,8 @@
 {
 	struct dbox_mailbox *mbox =
 		(struct dbox_mailbox *)trans->ibox;
-	int synced = FALSE, ret;
+	bool synced = FALSE;
+	int ret;
 
 	for (;;) {
 		ret = dbox_file_lookup_offset(mbox, trans->trans_view, seq,

Index: dbox-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-save.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbox-save.c	27 Nov 2005 23:05:29 -0000	1.1
+++ dbox-save.c	13 Jan 2006 20:26:29 -0000	1.2
@@ -29,7 +29,7 @@
 	uint64_t hdr_offset;
 	uint64_t mail_offset;
 
-	int failed;
+	bool failed;
 };
 
 struct mail_save_context *
@@ -37,7 +37,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 __attr_unused__)
+	       struct istream *input, bool want_mail __attr_unused__)
 {
 	struct dbox_transaction_context *t =
 		(struct dbox_transaction_context *)_t;

Index: dbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-storage.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbox-storage.c	11 Jan 2006 19:26:05 -0000	1.3
+++ dbox-storage.c	13 Jan 2006 20:26:29 -0000	1.4
@@ -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;
 };
@@ -27,7 +27,7 @@
 extern struct mail_storage dbox_storage;
 extern struct mailbox dbox_mailbox;
 
-static int dbox_handle_errors(struct index_storage *istorage)
+static bool dbox_handle_errors(struct index_storage *istorage)
 {
 	struct mail_storage *storage = &istorage->storage;
 
@@ -47,7 +47,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 dbox_storage *storage;
 	struct index_storage *istorage;
 	const char *root_dir, *index_dir, *p;
@@ -125,9 +125,9 @@
 	pool_unref(storage->storage.pool);
 }
 
-static int dbox_autodetect(const char *data, enum mail_storage_flags flags)
+static bool dbox_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;
 
@@ -148,10 +148,10 @@
 	return TRUE;
 }
 
-int dbox_is_valid_mask(struct mail_storage *storage, const char *mask)
+bool dbox_is_valid_mask(struct mail_storage *storage, const char *mask)
 {
 	const char *p;
-	int newdir;
+	bool newdir;
 
 	if ((storage->flags & MAIL_STORAGE_FLAG_FULL_FS_ACCESS) != 0)
 		return TRUE;
@@ -171,8 +171,8 @@
 	return TRUE;
 }
 
-static int dbox_is_valid_create_name(struct mail_storage *storage,
-				     const char *name)
+static bool dbox_is_valid_create_name(struct mail_storage *storage,
+				      const char *name)
 {
 	size_t len;
 
@@ -184,8 +184,8 @@
 	return dbox_is_valid_mask(storage, name);
 }
 
-static int dbox_is_valid_existing_name(struct mail_storage *storage,
-				       const char *name)
+static bool dbox_is_valid_existing_name(struct mail_storage *storage,
+					const char *name)
 {
 	size_t len;
 
@@ -242,8 +242,8 @@
 	return 0;
 }
 
-static int dbox_is_recent(struct index_mailbox *ibox __attr_unused__,
-			  uint32_t uid __attr_unused__)
+static bool dbox_is_recent(struct index_mailbox *ibox __attr_unused__,
+			   uint32_t uid __attr_unused__)
 {
 	return FALSE;
 }
@@ -371,7 +371,7 @@
 
 static int dbox_mailbox_create(struct mail_storage *_storage,
 			       const char *name,
-			       int directory __attr_unused__)
+			       bool directory __attr_unused__)
 {
 	struct dbox_storage *storage = (struct dbox_storage *)_storage;
 	struct index_storage *istorage = INDEX_STORAGE(storage);
@@ -530,7 +530,7 @@
 }
 
 static int dbox_set_subscribed(struct mail_storage *_storage,
-			       const char *name, int set)
+			       const char *name, bool set)
 {
 	struct dbox_storage *storage = (struct dbox_storage *)_storage;
 	const char *path;

Index: dbox-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-storage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbox-storage.h	11 Jan 2006 19:26:05 -0000	1.4
+++ dbox-storage.h	13 Jan 2006 20:26:29 -0000	1.5
@@ -112,7 +112,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 dbox_save_continue(struct mail_save_context *ctx);
 int dbox_save_finish(struct mail_save_context *ctx, struct mail *dest_mail);
 void dbox_save_cancel(struct mail_save_context *ctx);
@@ -121,7 +121,7 @@
 void dbox_transaction_save_commit_post(struct dbox_save_context *ctx);
 void dbox_transaction_save_rollback(struct dbox_save_context *ctx);
 
-int dbox_is_valid_mask(struct mail_storage *storage, const char *mask);
+bool dbox_is_valid_mask(struct mail_storage *storage, const char *mask);
 
 int dbox_mail_lookup_offset(struct index_transaction_context *trans,
 			    uint32_t seq, uint32_t *file_seq_r,

Index: dbox-sync-expunge.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-sync-expunge.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbox-sync-expunge.c	21 Dec 2005 17:20:08 -0000	1.3
+++ dbox-sync-expunge.c	13 Jan 2006 20:26:29 -0000	1.4
@@ -212,7 +212,8 @@
 	unsigned int i, count, sync_count;
 	uint32_t file_seq, uid, uid1, uid2, first_expunged_uid;
 	uoff_t offset;
-	int ret, seen_expunges, skipped_expunges;
+	int ret;
+	bool seen_expunges, skipped_expunges;
 
 	sync_recs = array_get(&sync_entry->sync_recs, &sync_count);
 	if (dbox_sync_get_file_offset(ctx, sync_recs[sync_idx].seq1,

Index: dbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-sync.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbox-sync.c	21 Dec 2005 18:43:16 -0000	1.3
+++ dbox-sync.c	13 Jan 2006 20:26:29 -0000	1.4
@@ -283,7 +283,7 @@
 	return ret;
 }
 
-int dbox_sync(struct dbox_mailbox *mbox, int force)
+int dbox_sync(struct dbox_mailbox *mbox, bool force)
 {
 	struct dbox_sync_context ctx;
 	const struct mail_index_header *hdr;

Index: dbox-sync.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-sync.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbox-sync.h	21 Dec 2005 18:43:16 -0000	1.3
+++ dbox-sync.h	13 Jan 2006 20:26:29 -0000	1.4
@@ -47,7 +47,7 @@
 	array_t ARRAY_DEFINE(exists, struct seq_range);
 };
 
-int dbox_sync(struct dbox_mailbox *mbox, int force);
+int dbox_sync(struct dbox_mailbox *mbox, bool force);
 int dbox_sync_if_changed(struct dbox_mailbox *mbox);
 
 struct mailbox_sync_context *

Index: dbox-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-uidlist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbox-uidlist.c	13 Jan 2006 12:45:42 -0000	1.11
+++ dbox-uidlist.c	13 Jan 2006 20:26:29 -0000	1.12
@@ -156,8 +156,8 @@
 	return (int)*file_seq - (int)(*entry)->file_seq;
 }
 
-static int dbox_uidlist_add_entry(struct dbox_uidlist *uidlist,
-				  const struct dbox_uidlist_entry *src_entry)
+static bool dbox_uidlist_add_entry(struct dbox_uidlist *uidlist,
+				   const struct dbox_uidlist_entry *src_entry)
 {
 	struct dbox_uidlist_entry *dest_entry, **entries, **pos;
 	const struct seq_range *range;
@@ -210,7 +210,7 @@
 	return TRUE;
 }
 
-static int dbox_uidlist_next(struct dbox_uidlist *uidlist, const char *line)
+static bool dbox_uidlist_next(struct dbox_uidlist *uidlist, const char *line)
 {
 	struct dbox_uidlist_entry *entry;
 	struct seq_range range;