undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imap-send.c: fold struct store into struct imap_store

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2013-01-15 09:06:31 +01:00 committed by Junio C Hamano
parent 9a08cbb7cd
commit 636fd66bc1
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imap-send.c
View File

@ -33,12 +33,6 @@ typedef void *SSL;
#include <openssl/hmac.h> #include <openssl/hmac.h>
#endif #endif
struct store {
/* currently open mailbox */
const char *name; /* foreign! maybe preset? */
int uidvalidity;
};
static const char imap_send_usage[] = "git imap-send < <mbox>"; static const char imap_send_usage[] = "git imap-send < <mbox>";
#undef DRV_OK #undef DRV_OK
@ -123,7 +117,9 @@ struct imap {
}; };
struct imap_store { struct imap_store {
struct store gen; /* currently open mailbox */
const char *name; /* foreign! maybe preset? */
int uidvalidity;
struct imap *imap; struct imap *imap;
const char *prefix; const char *prefix;
}; };
@ -618,7 +614,7 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb,
*p++ = 0; *p++ = 0;
arg = next_arg(&s); arg = next_arg(&s);
if (!strcmp("UIDVALIDITY", arg)) { if (!strcmp("UIDVALIDITY", arg)) {
if (!(arg = next_arg(&s)) || !(ctx->gen.uidvalidity = atoi(arg))) { if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg))) {
fprintf(stderr, "IMAP error: malformed UIDVALIDITY status\n"); fprintf(stderr, "IMAP error: malformed UIDVALIDITY status\n");
return RESP_BAD; return RESP_BAD;
} }
@ -636,7 +632,7 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb,
for (; isspace((unsigned char)*p); p++); for (; isspace((unsigned char)*p); p++);
fprintf(stderr, "*** IMAP ALERT *** %s\n", p); fprintf(stderr, "*** IMAP ALERT *** %s\n", p);
} else if (cb && cb->ctx && !strcmp("APPENDUID", arg)) { } else if (cb && cb->ctx && !strcmp("APPENDUID", arg)) {
if (!(arg = next_arg(&s)) || !(ctx->gen.uidvalidity = atoi(arg)) || if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg)) ||
!(arg = next_arg(&s)) || !(*(int *)cb->ctx = atoi(arg))) { !(arg = next_arg(&s)) || !(*(int *)cb->ctx = atoi(arg))) {
fprintf(stderr, "IMAP error: malformed APPENDUID status\n"); fprintf(stderr, "IMAP error: malformed APPENDUID status\n");
return RESP_BAD; return RESP_BAD;
@ -1150,7 +1146,7 @@ static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg)
cb.dlen = msg->len; cb.dlen = msg->len;
cb.data = strbuf_detach(msg, NULL); cb.data = strbuf_detach(msg, NULL);
box = ctx->gen.name; box = ctx->name;
prefix = !strcmp(box, "INBOX") ? "" : ctx->prefix; prefix = !strcmp(box, "INBOX") ? "" : ctx->prefix;
cb.create = 0; cb.create = 0;
ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" ", prefix, box); ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" ", prefix, box);
@ -1362,7 +1358,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->gen.name = imap_folder; ctx->name = imap_folder;
while (1) { while (1) {
unsigned percent = n * 100 / total; unsigned percent = n * 100 / total;