Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8396:8b8a424ed82e HEAD
Make maildir++ iter_is_mailbox() code consistent with others.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 15 Nov 2008 18:07:48 +0200 |
| parents | 401d1d3f4eca |
| children | 83cfa6204784 |
| files | src/lib-storage/index/maildir/maildir-storage.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/maildir/maildir-storage.c Sat Nov 15 17:57:38 2008 +0200 +++ b/src/lib-storage/index/maildir/maildir-storage.c Sat Nov 15 18:07:48 2008 +0200 @@ -933,7 +933,7 @@ 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; @@ -953,7 +953,7 @@ st.st_mtime < ioloop_time - 3600) (void)unlink_directory(path, TRUE); - *flags_r = MAILBOX_NONEXISTENT; + *flags |= MAILBOX_NONEXISTENT; return 0; } @@ -965,7 +965,7 @@ 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: @@ -989,17 +989,17 @@ 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 {