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

Rename confusing variables in psftp_main().

Browse Source 
Another of this weekend's warnings pointed out that this function
contained a pattern I now regard as a cardinal sin: variables called
'ret' that aren't clear whether they've _been_ returned from a
subroutine, or whether they're _planned_ to be returned from the
containing function. Worse, psftp_main had both: two of the former
kind shadowing a case of the latter in sub-scopes.
This commit is contained in:
Simon Tatham 2022-09-04 10:54:34 +01:00
parent 26f220a1a0
commit 9e7d4c53d8
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
psftp.c
View File

@ -2790,7 +2790,7 @@ const unsigned cmdline_tooltype = TOOLTYPE_FILETRANSFER;
*/ */
int psftp_main(int argc, char *argv[]) int psftp_main(int argc, char *argv[])
{ {
int i, ret; int i, toret;
int portnumber = 0; int portnumber = 0;
char *userhost, *user; char *userhost, *user;
int mode = 0; int mode = 0;
@ -2807,7 +2807,7 @@ int psftp_main(int argc, char *argv[])
do_defaults(NULL, conf); do_defaults(NULL, conf);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
int ret; int retd;
if (argv[i][0] != '-') { if (argv[i][0] != '-') {
if (userhost) if (userhost)
usage(); usage();
@ -2815,12 +2815,13 @@ int psftp_main(int argc, char *argv[])
userhost = dupstr(argv[i]); userhost = dupstr(argv[i]);
continue; continue;
} }
ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1, conf); retd = cmdline_process_param(
if (ret == -2) { argv[i], i+1 < argc ? argv[i+1] : NULL, 1, conf);
if (retd == -2) {
cmdline_error("option \"%s\" requires an argument", argv[i]); cmdline_error("option \"%s\" requires an argument", argv[i]);
} else if (ret == 2) { } else if (retd == 2) {
i++; /* skip next argument */ i++; /* skip next argument */
} else if (ret == 1) { } else if (retd == 1) {
/* We have our own verbosity in addition to `flags'. */ /* We have our own verbosity in addition to `flags'. */
if (cmdline_verbose()) if (cmdline_verbose())
verbose = true; verbose = true;
@ -2881,10 +2882,10 @@ int psftp_main(int argc, char *argv[])
* it now. * it now.
*/ */
if (userhost) { if (userhost) {
int ret; int retd;
ret = psftp_connect(userhost, user, portnumber); retd = psftp_connect(userhost, user, portnumber);
sfree(userhost); sfree(userhost);
if (ret) if (retd)
return 1; return 1;
if (do_sftp_init()) if (do_sftp_init())
return 1; return 1;
@ -2893,7 +2894,7 @@ int psftp_main(int argc, char *argv[])
" to connect\n"); " to connect\n");
} }
ret = do_sftp(mode, modeflags, batchfile); toret = do_sftp(mode, modeflags, batchfile);
if (backend && backend_connected(backend)) { if (backend && backend_connected(backend)) {
char ch; char ch;
@ -2912,5 +2913,5 @@ int psftp_main(int argc, char *argv[])
if (psftp_logctx) if (psftp_logctx)
log_free(psftp_logctx); log_free(psftp_logctx);
return ret; return toret;
} }