diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-08-07 23:09:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 18:35:46 (GMT) |
| commit | 1702b1381e2a7193d74f6dc649c86e15ec72b4dc (patch) | |
| tree | 75a43721a4fbe353eb907235e26d3f592799953a | |
| parent | 24aea033138561e5501ee5dfb3459f3ae4940625 (diff) | |
| download | git-1702b1381e2a7193d74f6dc649c86e15ec72b4dc.zip git-1702b1381e2a7193d74f6dc649c86e15ec72b4dc.tar.gz git-1702b1381e2a7193d74f6dc649c86e15ec72b4dc.tar.bz2 | |
imap-send: Fix sprintf usage
When composing a command for the imap server, imap-send uses a single
nfsnprintf() invocation for brevity instead of dealing separately with
the case when there is a message to be sent and the case when there
isn’t. The unused argument in the second case, while valid, is
confusing for static analyzers and human readers.
v1.6.4-rc0~117 (imap-send: add support for IPv6, 2009-05-25)
mistakenly used %hu as the format for an int “port”, by analogy with
existing usage for the unsigned short “addr.sin_port”. Use %d
instead.
Noticed with clang.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | imap-send.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/imap-send.c b/imap-send.c index 1a577a0..71506a8 100644 --- a/imap-send.c +++ b/imap-send.c @@ -543,9 +543,13 @@ static struct imap_cmd *v_issue_imap_cmd(struct imap_store *ctx, while (imap->literal_pending) get_cmd_result(ctx, NULL); - bufl = nfsnprintf(buf, sizeof(buf), cmd->cb.data ? CAP(LITERALPLUS) ? - "%d %s{%d+}\r\n" : "%d %s{%d}\r\n" : "%d %s\r\n", - cmd->tag, cmd->cmd, cmd->cb.dlen); + if (!cmd->cb.data) + bufl = nfsnprintf(buf, sizeof(buf), "%d %s\r\n", cmd->tag, cmd->cmd); + else + bufl = nfsnprintf(buf, sizeof(buf), "%d %s{%d%s}\r\n", + cmd->tag, cmd->cmd, cmd->cb.dlen, + CAP(LITERALPLUS) ? "+" : ""); + if (Verbose) { if (imap->num_in_progress) printf("(%d in progress) ", imap->num_in_progress); @@ -1086,7 +1090,7 @@ static struct store *imap_open_store(struct imap_server_conf *srvc) int gai; char portstr[6]; - snprintf(portstr, sizeof(portstr), "%hu", srvc->port); + snprintf(portstr, sizeof(portstr), "%d", srvc->port); memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_STREAM; |