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 redundant null checks for arguments to sftp_{get,put}_file

Browse Source 
which are (a) never NULL anyway, and (b) have already been
dereferenced by the time we make those checks so it would be too late
if they were.

[originally from svn r9906]
This commit is contained in:
Simon Tatham 2013-07-11 17:24:10 +00:00
parent 85300e0b15
commit 8201e7d22d
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
psftp.c
View File

@ -342,11 +342,8 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
while (i < nnames) {
char *nextoutfname;
int ret;
if (outfname)
nextoutfname = dir_file_cat(outfname,
ournames[i]->filename);
else
nextoutfname = dupstr(ournames[i]->filename);
nextoutfname = dir_file_cat(outfname,
ournames[i]->filename);
ret = (file_type(nextoutfname) == FILE_TYPE_NONEXISTENT);
sfree(nextoutfname);
if (ret)
@ -368,11 +365,7 @@ int sftp_get_file(char *fname, char *outfname, int recurse, int restart)
int ret;
nextfname = dupcat(fname, "/", ournames[i]->filename, NULL);
if (outfname)
nextoutfname = dir_file_cat(outfname,
ournames[i]->filename);
else
nextoutfname = dupstr(ournames[i]->filename);
nextoutfname = dir_file_cat(outfname, ournames[i]->filename);
ret = sftp_get_file(nextfname, nextoutfname, recurse, restart);
restart = FALSE; /* after first partial file, do full */
sfree(nextoutfname);
@ -614,10 +607,7 @@ int sftp_put_file(char *fname, char *outfname, int recurse, int restart)
char *nextfname, *nextoutfname;
int ret;
if (fname)
nextfname = dir_file_cat(fname, ournames[i]);
else
nextfname = dupstr(ournames[i]);
nextfname = dir_file_cat(fname, ournames[i]);
nextoutfname = dupcat(outfname, "/", ournames[i], NULL);
ret = sftp_put_file(nextfname, nextoutfname, recurse, restart);
restart = FALSE; /* after first partial file, do full */