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

Remove unused params from cmdline_get_passwd_input.

Browse Source 
NFC; I expect this to be a useful simplification for the same reasons
as the previous commit.
This commit is contained in:
Simon Tatham 2018-05-18 07:22:56 +01:00
parent 3692c239d7
commit a486318dad
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmdline.c
View File

@ -85,7 +85,7 @@ void cmdline_cleanup(void)
* return means that we aren't capable of processing the prompt and
* someone else should do it.
*/
int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
int cmdline_get_passwd_input(prompts_t *p)
{
static int tried_once = 0;
@ -94,7 +94,7 @@ int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
* passwords), and (currently) we only cope with a password prompt
* that comes in a prompt-set on its own.
*/
if (!cmdline_password || in || p->n_prompts != 1 || p->prompts[0]->echo) {
if (!cmdline_password || p->n_prompts != 1 || p->prompts[0]->echo) {
return -1;
}

2
nocmdline.c
View File

@ -15,7 +15,7 @@
* handling, then there is no such option, so that function always
* returns failure.
*/
int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
int cmdline_get_passwd_input(prompts_t *p)
{
return -1;
}

2
putty.h
View File

@ -1396,7 +1396,7 @@ void printer_finish_job(printer_job *);
int cmdline_process_param(const char *, char *, int, Conf *);
void cmdline_run_saved(Conf *);
void cmdline_cleanup(void);
int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen);
int cmdline_get_passwd_input(prompts_t *p);
int cmdline_host_ok(Conf *);
#define TOOLTYPE_FILETRANSFER 1
#define TOOLTYPE_NONNETWORK 2

2
unix/gtkwin.c
View File

@ -325,7 +325,7 @@ int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
struct gui_data *inst = (struct gui_data *)p->frontend;
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
ret = cmdline_get_passwd_input(p);
if (ret == -1)
ret = term_get_userpass_input(inst->term, p, in, inlen);
return ret;

2
unix/uxplink.c
View File

@ -435,7 +435,7 @@ int from_backend_eof(void *frontend_handle)
int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
ret = cmdline_get_passwd_input(p);
if (ret == -1)
ret = console_get_userpass_input(p);
return ret;

2
unix/uxsftp.c
View File

@ -71,7 +71,7 @@ char *get_ttymode(void *frontend, const char *mode) { return NULL; }
int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
ret = cmdline_get_passwd_input(p);
if (ret == -1)
ret = console_get_userpass_input(p);
return ret;

2
windows/window.c
View File

@ -5937,7 +5937,7 @@ int from_backend_eof(void *frontend)
int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
ret = cmdline_get_passwd_input(p);
if (ret == -1)
ret = term_get_userpass_input(term, p, in, inlen);
return ret;

2
windows/winplink.c
View File

@ -134,7 +134,7 @@ int from_backend_eof(void *frontend_handle)
int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
ret = cmdline_get_passwd_input(p);
if (ret == -1)
ret = console_get_userpass_input(p, in, inlen);
return ret;

2
windows/winsftp.c
View File

@ -18,7 +18,7 @@ char *get_ttymode(void *frontend, const char *mode) { return NULL; }
int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
ret = cmdline_get_passwd_input(p);
if (ret == -1)
ret = console_get_userpass_input(p, in, inlen);
return ret;