From 0e1d35de83de2ccda116a839b17898e8490112c9 Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Sat, 13 Nov 1999 01:54:12 +0000 Subject: [PATCH] variable name change to silence build warning --- xpinstall/src/ScheduledTasks.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/xpinstall/src/ScheduledTasks.cpp b/xpinstall/src/ScheduledTasks.cpp index 77491d86c6cb..950b835b08cd 100644 --- a/xpinstall/src/ScheduledTasks.cpp +++ b/xpinstall/src/ScheduledTasks.cpp @@ -199,18 +199,17 @@ PRInt32 ReplaceFileNow(nsFileSpec& replacementFile, nsFileSpec& doomedFile ) // first try to rename the doomed file out of the way (if it exists) char* leafname; - nsFileSpec tmpfile( doomedFile ); - if ( tmpfile.Exists() ) + nsFileSpec tmpFile( doomedFile ); + if ( tmpFile.Exists() ) { - tmpfile.MakeUnique(); - leafname = tmpfile.GetLeafName(); - tmpfile = doomedFile; - tmpfile.Rename( leafname ); + tmpFile.MakeUnique(); + leafname = tmpFile.GetLeafName(); + tmpFile = doomedFile; + tmpFile.Rename( leafname ); nsCRT::free( leafname ); } - // if doomedFile is gone move new file into place nsresult rv; if ( !doomedFile.Exists() ) @@ -241,12 +240,12 @@ PRInt32 ReplaceFileNow(nsFileSpec& replacementFile, nsFileSpec& doomedFile ) { // we replaced the old file OK, now we have to // get rid of it permanently - result = DeleteFileNowOrSchedule( tmpfile ); + result = DeleteFileNowOrSchedule( tmpFile ); } else { // couldn't rename file, try to put old file back - tmpfile.Rename( leafname ); + tmpFile.Rename( leafname ); } nsCRT::free( leafname ); }