From: Jeff King Date: Fri, 03 Feb 2012 22:14:11 GMT Subject: [PATCH 1/2] prompt: clean up strbuf usage Message-ID: <20120203221411.GA8065@sigill.intra.peff.net> In-Reply-To: <20120203213654.GD1890@sigill.intra.peff.net> 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 --- Neither is a big deal, but just some style cleanups while I was in the area. prompt.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/prompt.c b/prompt.c index 72ab9de..64f817b 100644 --- a/prompt.c +++ b/prompt.c @@ -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) -- 1.7.9.rc1.28.gf4be5