From 31b49d9b653803e7c7fd18b21c8bdd86e3421668 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 3 Feb 2012 17:14:11 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- prompt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prompt.c b/prompt.c index 72ab9de2f9..64f817b36d 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) -- 2.11.4.GIT