nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused params from console_get_userpass_input.

Browse Source 
NFC: this is a preliminary refactoring, intended to make my life
easier when I start changing around the APIs used to pass user
keyboard input around. The fewer functions even _have_ such an API,
the less I'll have to do at that point.
This commit is contained in:
Simon Tatham 2018-05-18 07:22:56 +01:00
parent 14a69dc632
commit 3692c239d7
7 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdgen.c
View File

@ -46,7 +46,7 @@ char *get_random_data(int len, const char *device)
#define console_get_userpass_input console_get_userpass_input_diagnostic #define console_get_userpass_input console_get_userpass_input_diagnostic
int nprompts, promptsgot; int nprompts, promptsgot;
const char *prompts[3]; const char *prompts[3];
int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen) int console_get_userpass_input(prompts_t *p)
{ {
size_t i; size_t i;
int ret = 1; int ret = 1;
@ -785,7 +785,7 @@ int main(int argc, char **argv)
p->to_server = FALSE; p->to_server = FALSE;
p->name = dupstr("SSH key passphrase"); p->name = dupstr("SSH key passphrase");
add_prompt(p, dupstr("Enter passphrase to load key: "), FALSE); add_prompt(p, dupstr("Enter passphrase to load key: "), FALSE);
ret = console_get_userpass_input(p, NULL, 0); ret = console_get_userpass_input(p);
assert(ret >= 0); assert(ret >= 0);
if (!ret) { if (!ret) {
free_prompts(p); free_prompts(p);
@ -932,7 +932,7 @@ int main(int argc, char **argv)
p->name = dupstr("New SSH key passphrase"); p->name = dupstr("New SSH key passphrase");
add_prompt(p, dupstr("Enter passphrase to save key: "), FALSE); add_prompt(p, dupstr("Enter passphrase to save key: "), FALSE);
add_prompt(p, dupstr("Re-enter passphrase to verify: "), FALSE); add_prompt(p, dupstr("Re-enter passphrase to verify: "), FALSE);
ret = console_get_userpass_input(p, NULL, 0); ret = console_get_userpass_input(p);
assert(ret >= 0); assert(ret >= 0);
if (!ret) { if (!ret) {
free_prompts(p); free_prompts(p);

3
putty.h
View File

@ -1367,8 +1367,7 @@ int askappend(void *frontend, Filename *filename,
* that aren't equivalents to things in windlg.c et al. * that aren't equivalents to things in windlg.c et al.
*/ */
extern int console_batch_mode; extern int console_batch_mode;
int console_get_userpass_input(prompts_t *p, const unsigned char *in, int console_get_userpass_input(prompts_t *p);
int inlen);
void console_provide_logctx(void *logctx); void console_provide_logctx(void *logctx);
int is_interactive(void); int is_interactive(void);

3
unix/uxcons.c
View File

@ -456,8 +456,7 @@ static void console_prompt_text(FILE *outfp, const char *data, int len)
fflush(outfp); fflush(outfp);
} }
int console_get_userpass_input(prompts_t *p, const unsigned char *in, int console_get_userpass_input(prompts_t *p)
int inlen)
{ {
size_t curr_prompt; size_t curr_prompt;
FILE *outfp = NULL; FILE *outfp = NULL;

2
unix/uxpgnt.c
View File

@ -351,7 +351,7 @@ static char *askpass_tty(const char *prompt)
p->to_server = FALSE; p->to_server = FALSE;
p->name = dupstr("Pageant passphrase prompt"); p->name = dupstr("Pageant passphrase prompt");
add_prompt(p, dupcat(prompt, ": ", (const char *)NULL), FALSE); add_prompt(p, dupcat(prompt, ": ", (const char *)NULL), FALSE);
ret = console_get_userpass_input(p, NULL, 0); ret = console_get_userpass_input(p);
assert(ret >= 0); assert(ret >= 0);
if (!ret) { if (!ret) {

2
unix/uxplink.c
View File

@ -437,7 +437,7 @@ int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
int ret; int ret;
ret = cmdline_get_passwd_input(p, in, inlen); ret = cmdline_get_passwd_input(p, in, inlen);
if (ret == -1) if (ret == -1)
ret = console_get_userpass_input(p, in, inlen); ret = console_get_userpass_input(p);
return ret; return ret;
} }

2
unix/uxsftp.c
View File

@ -73,7 +73,7 @@ int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
int ret; int ret;
ret = cmdline_get_passwd_input(p, in, inlen); ret = cmdline_get_passwd_input(p, in, inlen);
if (ret == -1) if (ret == -1)
ret = console_get_userpass_input(p, in, inlen); ret = console_get_userpass_input(p);
return ret; return ret;
} }

3
windows/wincons.c
View File

@ -355,8 +355,7 @@ static void console_data_untrusted(HANDLE hout, const char *data, int len)
WriteFile(hout, data, len, &dummy, NULL); WriteFile(hout, data, len, &dummy, NULL);
} }
int console_get_userpass_input(prompts_t *p, int console_get_userpass_input(prompts_t *p)
const unsigned char *in, int inlen)
{ {
HANDLE hin, hout; HANDLE hin, hout;
size_t curr_prompt; size_t curr_prompt;