lib-storage: index/imapc - Replace i_<log>() with e_<log>()

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index c3d1ac1edd099049dbd1c18e14f093ce4a5f94ab..e9c1f190007da588fa496d8b8605347c6e971d34 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -415,6 +415,7 @@ imapc_list_get_vname(struct mailbox_list *_list, const char *storage_name)
 
 static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list)
 {
+       struct event *event = list->list.ns->user->event;
        struct mailbox_list_settings list_set;
        const char *error, *dir;
 
@@ -437,7 +438,8 @@ static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list)
                if (mailbox_list_create(list_set.layout, list->list.ns,
                                        &list_set, MAILBOX_LIST_FLAG_SECONDARY,
                                        &list->index_list, &error) < 0) {
-                       i_error("imapc: Couldn't create %s mailbox list: %s",
+                       e_error(event,
+                               "imapc: Couldn't create %s mailbox list: %s",
                                list_set.layout, error);
                        list->index_list_failed = TRUE;
                }

diff --git a/src/lib-storage/index/imapc/imapc-mail-fetch.c b/src/lib-storage/index/imapc/imapc-mail-fetch.c
index 0e00a1d8ca1b7fcc86dbffd0f43250e575bec338..176830efb1f61ba6373cdae10145e1a5d117f835 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mail-fetch.c
+++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c
@@ -638,6 +638,7 @@ imapc_fetch_stream(struct imapc_mail *mail,
 {
        struct index_mail *imail = &mail->imail;
        struct imapc_mailbox *mbox = IMAPC_MAILBOX(imail->mail.mail.box);
+       struct event *event = mbox->box.event;
        struct istream *hdr_stream = NULL;
        const char *value;
        int fd;
@@ -658,7 +659,7 @@ imapc_fetch_stream(struct imapc_mail *mail,
                           header stream. we'll need to recreate the stream
                           with autoclosed fd. */
                        if (lseek(mail->fd, 0, SEEK_SET) < 0)
-                               i_error("lseek(imapc) failed: %m");
+                               e_error(event, "lseek(imapc) failed: %m");
                        hdr_stream = i_stream_create_fd_autoclose(&mail->fd, 0);
                }
                index_mail_close_streams(imail);
@@ -677,7 +678,7 @@ imapc_fetch_stream(struct imapc_mail *mail,
                        return;
                }
                if ((fd = dup(fd)) == -1) {
-                       i_error("dup() failed: %m");
+                       e_error(event, "dup() failed: %m");
                        i_stream_unref(&hdr_stream);
                        return;
                }

diff --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c
index ff915d96118933bbc2e3308c645032fd01345929..7685122f043e07785a2d8257af614b942f8def12 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mailbox.c
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c
@@ -767,6 +767,7 @@ static void
 imapc_untagged_esearch_gmail_pop3(const struct imap_arg *args,
                                  struct imapc_mailbox *mbox)
 {
+       struct event *event = mbox->box.event;
        struct imapc_msgmap *msgmap;
        const char *atom;
        struct seq_range_iter iter;
@@ -786,7 +787,7 @@ imapc_untagged_esearch_gmail_pop3(const struct imap_arg *args,
        if (!imap_arg_atom_equals(&args[0], "ALL") ||
            !imap_arg_get_atom(&args[1], &atom) ||
            imap_seq_set_nostar_parse(atom, &rseqs) < 0) {
-               i_error("Invalid gmail-pop3 ESEARCH reply");
+               e_error(event, "Invalid gmail-pop3 ESEARCH reply");
                return;
        }
 

diff --git a/src/lib-storage/index/imapc/imapc-search.c b/src/lib-storage/index/imapc/imapc-search.c
index ec2e9086336f72ed888cc856713eba016cb0bbc4..aeddfd8dbb1edd118c9d5486e6093259f07baeb1 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-search.c
+++ b/src/lib-storage/index/imapc/imapc-search.c
@@ -289,13 +289,14 @@ int imapc_search_deinit(struct mail_search_context *ctx)
 void imapc_search_reply_search(const struct imap_arg *args,
                               struct imapc_mailbox *mbox)
 {
+       struct event *event = mbox->box.event;
        struct imapc_msgmap *msgmap =
                imapc_client_mailbox_get_msgmap(mbox->client_box);
        const char *atom;
        uint32_t uid, rseq;
 
        if (mbox->search_ctx == NULL) {
-               i_error("Unexpected SEARCH reply");
+               e_error(event, "Unexpected SEARCH reply");
                return;
        }
 
@@ -303,7 +304,7 @@ void imapc_search_reply_search(const struct imap_arg *args,
        for (unsigned int i = 0; args[i].type != IMAP_ARG_EOL; i++) {
                if (!imap_arg_get_atom(&args[i], &atom) ||
                    str_to_uint32(atom, &uid) < 0 || uid == 0) {
-                       i_error("Invalid SEARCH reply");
+                       e_error(event, "Invalid SEARCH reply");
                        break;
                }
                if (imapc_msgmap_uid_to_rseq(msgmap, uid, &rseq))
@@ -314,10 +315,11 @@ void imapc_search_reply_search(const struct imap_arg *args,
 void imapc_search_reply_esearch(const struct imap_arg *args,
                                struct imapc_mailbox *mbox)
 {
+       struct event *event = mbox->box.event;
        const char *atom;
 
        if (mbox->search_ctx == NULL) {
-               i_error("Unexpected ESEARCH reply");
+               e_error(event, "Unexpected ESEARCH reply");
                return;
        }
 
@@ -326,5 +328,5 @@ void imapc_search_reply_esearch(const struct imap_arg *args,
            (!imap_arg_atom_equals(&args[0], "ALL") ||
             !imap_arg_get_atom(&args[1], &atom) ||
             imap_seq_set_nostar_parse(atom, &mbox->search_ctx->rseqs) < 0))
-               i_error("Invalid ESEARCH reply");
+               e_error(event, "Invalid ESEARCH reply");
 }