mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prompt: clean up strbuf usage

Browse Source 
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>
This commit is contained in:
Jeff King
2012-02-03 17:14:11 -05:00
committed by Junio C Hamano
parent 828ea97de4
commit 31b49d9b65
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
prompt.c
View File

@ -21,7 +21,6 @@ static char *do_askpass(const char *cmd, const char *prompt)
if (start_command(&pass)) if (start_command(&pass))
exit(1); exit(1);
strbuf_reset(&buffer);
if (strbuf_read(&buffer, pass.out, 20) < 0) if (strbuf_read(&buffer, pass.out, 20) < 0)
die("failed to get '%s' from %s\n", prompt, cmd); 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")); strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));
return buffer.buf; return strbuf_detach(&buffer, NULL);
} }
char *git_prompt(const char *prompt, int flags) char *git_prompt(const char *prompt, int flags)