dovecot-1.1: Make maildir++ iter_is_mailbox() code consistent wi...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/838034a9f369
changeset: 8001:838034a9f369
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Nov 15 18:08:07 2008 +0200
description:
Make maildir++ iter_is_mailbox() code consistent with others.

diffstat:

1 file changed, 7 insertions(+), 7 deletions(-)
src/lib-storage/index/maildir/maildir-storage.c |   14 +++++++-------

diffs (52 lines):

diff -r 548f7e1d0bbe -r 838034a9f369 src/lib-storage/index/maildir/maildir-storage.c
--- a/src/lib-storage/index/maildir/maildir-storage.c	Sat Nov 15 17:57:10 2008 +0200
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Sat Nov 15 18:08:07 2008 +0200
@@ -935,7 +935,7 @@ maildirplusplus_iter_is_mailbox(struct m
 				const char *dir, const char *fname,
 				const char *mailbox_name ATTR_UNUSED,
 				enum mailbox_list_file_type type,
-				enum mailbox_info_flags *flags_r)
+				enum mailbox_info_flags *flags)
 {
 	struct maildir_storage *storage = MAILDIR_LIST_CONTEXT(ctx->list);
 	struct mail_storage *_storage = &storage->storage;
@@ -955,7 +955,7 @@ maildirplusplus_iter_is_mailbox(struct m
 		    st.st_mtime < ioloop_time - 3600)
 			(void)unlink_directory(path, TRUE);
 
-		*flags_r = MAILBOX_NONEXISTENT;
+		*flags |= MAILBOX_NONEXISTENT;
 		return 0;
 	}
 
@@ -967,7 +967,7 @@ maildirplusplus_iter_is_mailbox(struct m
 	case MAILBOX_LIST_FILE_TYPE_FILE:
 	case MAILBOX_LIST_FILE_TYPE_OTHER:
 		/* non-directories are not */
-		*flags_r = MAILBOX_NOSELECT;
+		*flags |= MAILBOX_NOSELECT;
 		return 0;
 
 	case MAILBOX_LIST_FILE_TYPE_UNKNOWN:
@@ -991,17 +991,17 @@ maildirplusplus_iter_is_mailbox(struct m
 				ret = 1;
 			else {
 				if (strncmp(fname, ".nfs", 4) == 0)
-					*flags_r = MAILBOX_NONEXISTENT;
+					*flags |= MAILBOX_NONEXISTENT;
 				else
-					*flags_r = MAILBOX_NOSELECT;
+					*flags |= MAILBOX_NOSELECT;
 				ret = 0;
 			}
 		} else if (errno == ENOENT) {
 			/* just deleted? */
-			*flags_r = MAILBOX_NONEXISTENT;
+			*flags |= MAILBOX_NONEXISTENT;
 			ret = 0;
 		} else {
-			*flags_r = MAILBOX_NOSELECT;
+			*flags |= MAILBOX_NOSELECT;
 			ret = 0;
 		}
 	} else {