From 120e61ccce21fd33d6b55b6f27346e1690b64bd8 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Thu, 7 Sep 2017 14:26:51 +0300 Subject: [PATCH] lib-storage: convert struct pop3_mail casts to container_of --- src/lib-storage/index/pop3c/pop3c-mail.c | 6 +++--- src/lib-storage/index/pop3c/pop3c-storage.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib-storage/index/pop3c/pop3c-mail.c b/src/lib-storage/index/pop3c/pop3c-mail.c index efd44e8a57..b0078b2774 100644 --- a/src/lib-storage/index/pop3c/pop3c-mail.c +++ b/src/lib-storage/index/pop3c/pop3c-mail.c @@ -26,7 +26,7 @@ pop3c_mail_alloc(struct mailbox_transaction_context *t, static void pop3c_mail_close(struct mail *_mail) { - struct pop3c_mail *pmail = (struct pop3c_mail *)_mail; + struct pop3c_mail *pmail = POP3C_MAIL(_mail); struct pop3c_mailbox *mbox = POP3C_MAILBOX(_mail->box); /* wait for any prefetch to finish before closing the mail */ @@ -140,7 +140,7 @@ pop3c_mail_prefetch_done(enum pop3c_command_state state, static bool pop3c_mail_prefetch(struct mail *_mail) { - struct pop3c_mail *pmail = (struct pop3c_mail *)_mail; + struct pop3c_mail *pmail = POP3C_MAIL(_mail); struct pop3c_mailbox *mbox = POP3C_MAILBOX(_mail->box); enum pop3c_capability capa; const char *cmd; @@ -170,7 +170,7 @@ pop3c_mail_get_stream(struct mail *_mail, bool get_body, struct message_size *hdr_size, struct message_size *body_size, struct istream **stream_r) { - struct pop3c_mail *pmail = (struct pop3c_mail *)_mail; + struct pop3c_mail *pmail = POP3C_MAIL(_mail); struct index_mail *mail = &pmail->imail; struct pop3c_mailbox *mbox = POP3C_MAILBOX(_mail->box); enum pop3c_capability capa; diff --git a/src/lib-storage/index/pop3c/pop3c-storage.h b/src/lib-storage/index/pop3c/pop3c-storage.h index 33d07d1ce8..f271a59c53 100644 --- a/src/lib-storage/index/pop3c/pop3c-storage.h +++ b/src/lib-storage/index/pop3c/pop3c-storage.h @@ -39,6 +39,7 @@ struct pop3c_mail { #define POP3C_STORAGE(s) container_of(s, struct pop3c_storage, storage) #define POP3C_MAILBOX(s) container_of(s, struct pop3c_mailbox, box) +#define POP3C_MAIL(s) container_of(s, struct pop3c_mail, imail.mail.mail) struct mail * pop3c_mail_alloc(struct mailbox_transaction_context *t, -- 2.47.3