mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imap-send.c: remove msg_data::flags, which was always zero

Browse Source 
This removes the need for function imap_make_flags(), so delete it,
too.

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:19 +01:00
committed by Junio C Hamano
parent be7baf913a
commit 719125c522
1 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
imap-send.c
View File

@ -70,7 +70,6 @@ struct store {
struct msg_data { struct msg_data {
struct strbuf data; struct strbuf data;
unsigned char flags;
}; };
static const char imap_send_usage[] = "git imap-send < <mbox>"; static const char imap_send_usage[] = "git imap-send < <mbox>";
@ -225,14 +224,6 @@ static const char *cap_list[] = {
static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd); static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd);
static const char *Flags[] = {
"Draft",
"Flagged",
"Answered",
"Seen",
"Deleted",
};
#ifndef NO_OPENSSL #ifndef NO_OPENSSL
static void ssl_socket_perror(const char *func) static void ssl_socket_perror(const char *func)
{ {
@ -1246,23 +1237,6 @@ bail:
return NULL; return NULL;
} }
static int imap_make_flags(int flags, char *buf)
{
const char *s;
unsigned i, d;
for (i = d = 0; i < ARRAY_SIZE(Flags); i++)
if (flags & (1 << i)) {
buf[d++] = ' ';
buf[d++] = '\\';
for (s = Flags[i]; *s; s++)
buf[d++] = *s;
}
buf[0] = '(';
buf[d++] = ')';
return d;
}
static void lf_to_crlf(struct strbuf *msg) static void lf_to_crlf(struct strbuf *msg)
{ {
size_t new_len; size_t new_len;
@ -1311,8 +1285,7 @@ static int imap_store_msg(struct store *gctx, struct msg_data *msg)
struct imap *imap = ctx->imap; struct imap *imap = ctx->imap;
struct imap_cmd_cb cb; struct imap_cmd_cb cb;
const char *prefix, *box; const char *prefix, *box;
int ret, d; int ret;
char flagstr[128];
lf_to_crlf(&msg->data); lf_to_crlf(&msg->data);
memset(&cb, 0, sizeof(cb)); memset(&cb, 0, sizeof(cb));
@ -1320,17 +1293,10 @@ static int imap_store_msg(struct store *gctx, struct msg_data *msg)
cb.dlen = msg->data.len; cb.dlen = msg->data.len;
cb.data = strbuf_detach(&msg->data, NULL); cb.data = strbuf_detach(&msg->data, NULL);
d = 0;
if (msg->flags) {
d = imap_make_flags(msg->flags, flagstr);
flagstr[d++] = ' ';
}
flagstr[d] = 0;
box = gctx->name; box = gctx->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\" %s", prefix, box, flagstr); ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" ", prefix, box);
imap->caps = imap->rcaps; imap->caps = imap->rcaps;
if (ret != DRV_OK) if (ret != DRV_OK)
return ret; return ret;
@ -1483,7 +1449,7 @@ static int git_imap_config(const char *key, const char *val, void *cb)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct strbuf all_msgs = STRBUF_INIT; struct strbuf all_msgs = STRBUF_INIT;
struct msg_data msg = {STRBUF_INIT, 0}; struct msg_data msg = {STRBUF_INIT};
struct store *ctx = NULL; struct store *ctx = NULL;
int ofs = 0; int ofs = 0;
int r; int r;