imap-send.c: use struct imap_store instead of struct store

In fact, all struct store instances are upcasts of struct imap_store
anyway, so stop making the distinction.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/imap-send.c b/imap-send.c
index 10236f3611a9a4ffb3cd7e2d264526bff2cf88c8..7141bcbbc496aef5b50329907a9ecdfbb750dbe1 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -792,9 +792,9 @@ static void imap_close_server(struct imap_store *ictx)
        free(imap);
 }
 
        free(imap);
 }
 

-static void imap_close_store(struct store *ctx)
+static void imap_close_store(struct imap_store *ctx)

 {
 {

-       imap_close_server((struct imap_store *)ctx);
+       imap_close_server(ctx);

        free(ctx);
 }
 
        free(ctx);
 }
 


@@ -879,7 +879,7 @@ static int auth_cram_md5(struct imap_store *ctx, struct imap_cmd *cmd, const cha
        return 0;
 }
 
        return 0;
 }
 

-static struct store *imap_open_store(struct imap_server_conf *srvc)
+static struct imap_store *imap_open_store(struct imap_server_conf *srvc)

 {
        struct imap_store *ctx;
        struct imap *imap;
 {
        struct imap_store *ctx;
        struct imap *imap;


@@ -1089,10 +1089,10 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
        } /* !preauth */
 
        ctx->prefix = "";
        } /* !preauth */
 
        ctx->prefix = "";

-       return (struct store *)ctx;
+       return ctx;

 
 bail:
 
 bail:

-       imap_close_store(&ctx->gen);
+       imap_close_store(ctx);

        return NULL;
 }
 
        return NULL;
 }
 


@@ -1138,9 +1138,8 @@ static void lf_to_crlf(struct strbuf *msg)
  * Store msg to IMAP.  Also detach and free the data from msg->data,
  * leaving msg->data empty.
  */
  * Store msg to IMAP.  Also detach and free the data from msg->data,
  * leaving msg->data empty.
  */

-static int imap_store_msg(struct store *gctx, struct strbuf *msg)
+static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg)

 {
 {

-       struct imap_store *ctx = (struct imap_store *)gctx;

        struct imap *imap = ctx->imap;
        struct imap_cmd_cb cb;
        const char *prefix, *box;
        struct imap *imap = ctx->imap;
        struct imap_cmd_cb cb;
        const char *prefix, *box;


@@ -1152,7 +1151,7 @@ static int imap_store_msg(struct store *gctx, struct strbuf *msg)
        cb.dlen = msg->len;
        cb.data = strbuf_detach(msg, NULL);
 
        cb.dlen = msg->len;
        cb.data = strbuf_detach(msg, NULL);
 

-       box = gctx->name;
+       box = ctx->gen.name;

        prefix = !strcmp(box, "INBOX") ? "" : ctx->prefix;
        cb.create = 0;
        ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" ", prefix, box);
        prefix = !strcmp(box, "INBOX") ? "" : ctx->prefix;
        cb.create = 0;
        ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" ", prefix, box);


@@ -1308,7 +1307,7 @@ int main(int argc, char **argv)
 {
        struct strbuf all_msgs = STRBUF_INIT;
        struct strbuf msg = STRBUF_INIT;
 {
        struct strbuf all_msgs = STRBUF_INIT;
        struct strbuf msg = STRBUF_INIT;

-       struct store *ctx = NULL;
+       struct imap_store *ctx = NULL;

        int ofs = 0;
        int r;
        int total, n = 0;
        int ofs = 0;
        int r;
        int total, n = 0;


@@ -1364,7 +1363,7 @@ int main(int argc, char **argv)
        }
 
        fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" : "");
        }
 
        fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" : "");

-       ctx->name = imap_folder;
+       ctx->gen.name = imap_folder;

        while (1) {
                unsigned percent = n * 100 / total;
 
        while (1) {
                unsigned percent = n * 100 / total;