diff options
author | Jeff King <peff@peff.net> | 2012-02-03 17:14:11 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-03 14:37:02 -0800 |
commit | 31b49d9b653803e7c7fd18b21c8bdd86e3421668 (patch) | |
tree | da885e35b5710ea8f100af03ed6c8b75c1905b44 | |
parent | Git 1.7.9 (diff) | |
download | tgif-31b49d9b653803e7c7fd18b21c8bdd86e3421668.tar.xz |
prompt: clean up strbuf usage
The do_askpass function inherited a few bad habits from the
original git_getpass. One, there's no need to strbuf_reset a
buffer which was just initialized. And two, it's a good
habit to use strbuf_detach to claim ownership of a buffer's
string (even though in this case the owning buffer goes out
of scope, so it's effectively the same thing).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | prompt.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -21,7 +21,6 @@ static char *do_askpass(const char *cmd, const char *prompt) if (start_command(&pass)) exit(1); - strbuf_reset(&buffer); if (strbuf_read(&buffer, pass.out, 20) < 0) die("failed to get '%s' from %s\n", prompt, cmd); @@ -32,7 +31,7 @@ static char *do_askpass(const char *cmd, const char *prompt) strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n")); - return buffer.buf; + return strbuf_detach(&buffer, NULL); } char *git_prompt(const char *prompt, int flags) |