t: wrap complicated expect_code users in a block

diff --git a/prompt.c b/prompt.c
index 35ddbfab0cc01899936e8eb4e45e6c7ac8981dd8..75406390c6fdabf74e74d4c2a90e6ac92afc4ccc 100644 (file)
--- a/prompt.c
+++ b/prompt.c
@@ -6,7 +6,7 @@
 
 static char *do_askpass(const char *cmd, const char *prompt)
 {
-       struct child_process pass;
+       struct child_process pass = CHILD_PROCESS_INIT;
        const char *args[3];
        static struct strbuf buffer = STRBUF_INIT;
        int err = 0;
@@ -15,7 +15,6 @@ static char *do_askpass(const char *cmd, const char *prompt)
        args[1] = prompt;
        args[2] = NULL;
 
-       memset(&pass, 0, sizeof(pass));
        pass.argv = args;
        pass.out = -1;
 
@@ -74,8 +73,3 @@ char *git_prompt(const char *prompt, int flags)
        }
        return r;
 }
-
-char *git_getpass(const char *prompt)
-{
-       return git_prompt(prompt, PROMPT_ASKPASS);
-}