kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

imap-send: simplify v_issue_imap_cmd() and get_cmd_result() using starts_with() 

Use starts_with() instead of memcmp() to check if NUL-terminated
strings match prefixes.  This gets rid of some magic string length
constants.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2014-08-30 18:14:24 +02:00 committed by Junio C Hamano
parent 3918057164
commit ba9b9e1242
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imap-send.c
View File

@ -526,7 +526,7 @@ static struct imap_cmd *v_issue_imap_cmd(struct imap_store *ctx,
if (Verbose) { if (Verbose) {
if (imap->num_in_progress) if (imap->num_in_progress)
printf("(%d in progress) ", imap->num_in_progress); printf("(%d in progress) ", imap->num_in_progress);
if (memcmp(cmd->cmd, "LOGIN", 5)) if (!starts_with(cmd->cmd, "LOGIN"))
printf(">>> %s", buf); printf(">>> %s", buf);
else else
printf(">>> %d LOGIN <user> <pass>\n", cmd->tag); printf(">>> %d LOGIN <user> <pass>\n", cmd->tag);
@ -829,7 +829,7 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
} else /*if (!strcmp("BAD", arg))*/ } else /*if (!strcmp("BAD", arg))*/
resp = RESP_BAD; resp = RESP_BAD;
fprintf(stderr, "IMAP command '%s' returned response (%s) - %s\n", fprintf(stderr, "IMAP command '%s' returned response (%s) - %s\n",
memcmp(cmdp->cmd, "LOGIN", 5) ? !starts_with(cmdp->cmd, "LOGIN") ?
cmdp->cmd : "LOGIN <user> <pass>", cmdp->cmd : "LOGIN <user> <pass>",
arg, cmd ? cmd : ""); arg, cmd ? cmd : "");
} }