Don't need to protect InvisibleTempFileStream against exceptions.

By definition, it will be cleared up by the OS automatically.

Also we don't need to support gcc 2.x any more. It was replaced by gcc3 in
2001, 12 years ago.

1 files changed, 4 insertions, 20 deletions

diff --git a/lib/backupstore/BackupCommands.cpp b/lib/backupstore/BackupCommands.cpp
index 8f113a41..fb1d1e45 100644
--- a/lib/backupstore/BackupCommands.cpp
+++ b/lib/backupstore/BackupCommands.cpp
@@ -395,26 +395,10 @@ std::auto_ptr<BackupProtocolMessage> BackupProtocolGetFile::DoCommand(BackupProt
 					p + 16);
 			
 			// Open the temporary file
-			std::auto_ptr<IOStream> combined;
-			try
-			{
-				{
-					// Write nastily to allow this to work with gcc 2.x
-					std::auto_ptr<IOStream> t(
-						new InvisibleTempFileStream(
-							tempFn.c_str(), 
-							O_RDWR | O_CREAT | 
-							O_EXCL | O_BINARY | 
-							O_TRUNC));
-					combined = t;
-				}
-			}
-			catch(...)
-			{
-				// Make sure it goes
-				::unlink(tempFn.c_str());
-				throw;
-			}
+			std::auto_ptr<IOStream> combined(
+				new InvisibleTempFileStream(
+					tempFn, O_RDWR | O_CREAT | O_EXCL |
+					O_BINARY | O_TRUNC));
 			
 			// Do the combining
 			BackupStoreFile::CombineFile(*diff, *diff2, *from, *combined);