AURORA: Rethrow the caught exception instead of a copy

xoreos · Mar 19, 2013 · b7b2c3e · b7b2c3e
1 parent d466a36
commit b7b2c3e
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 36 deletions.
diff --git a/src/aurora/2dafile.cpp b/src/aurora/2dafile.cpp
@@ -157,7 +157,7 @@ void TwoDAFile::load(Common::SeekableReadStream &twoda) {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading 2DA file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/2dareg.cpp b/src/aurora/2dareg.cpp
@@ -105,7 +105,7 @@ TwoDAFile *TwoDARegistry::load(const Common::UString &name) {
 		delete twoda;
 
 		e.add("Failed loading 2DA \"%s\"", name.c_str());
-		throw e;
+		throw;
 
 	} catch (...) {
 		delete twodaFile;

diff --git a/src/aurora/biffile.cpp b/src/aurora/biffile.cpp
@@ -84,7 +84,7 @@ void BIFFile::load() {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading BIF file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/erffile.cpp b/src/aurora/erffile.cpp
@@ -89,7 +89,7 @@ void ERFFile::load() {
 				readResources(erf, erfHeader);
 		} catch (Common::Exception &e) {
 			delete[] erfHeader.stringTable;
-			throw e;
+			throw;
 		}
 
 		delete[] erfHeader.stringTable;
@@ -99,7 +99,7 @@ void ERFFile::load() {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading ERF file");
-		throw e;
+		throw;
 	}
 
 }
@@ -415,7 +415,7 @@ Common::SeekableReadStream *ERFFile::decompressBiowareZlib(byte *compressedData,
 		return stream;
 	} catch (Common::Exception &e) {
 		delete[] compressedData;
-		throw e;
+		throw;
 	}
 }
 
@@ -426,7 +426,7 @@ Common::SeekableReadStream *ERFFile::decompressHeaderlessZlib(byte *compressedDa
 		return stream;
 	} catch (Common::Exception &e) {
 		delete[] compressedData;
-		throw e;
+		throw;
 	}
 }
 

diff --git a/src/aurora/gfffile.cpp b/src/aurora/gfffile.cpp
@@ -117,7 +117,7 @@ void GFFFile::load(uint32 id) {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading GFF file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/herffile.cpp b/src/aurora/herffile.cpp
@@ -71,7 +71,7 @@ void HERFFile::load() {
 	} catch (Common::Exception &e) {
 		delete herf;
 		e.add("Failed reading HERF file");
-		throw e;
+		throw;
 	}
 
 	delete herf;

diff --git a/src/aurora/keyfile.cpp b/src/aurora/keyfile.cpp
@@ -90,7 +90,7 @@ void KEYFile::load(Common::SeekableReadStream &key) {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading KEY file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/ndsrom.cpp b/src/aurora/ndsrom.cpp
@@ -76,7 +76,7 @@ void NDSFile::load() {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading NDS file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/nwscript/ncsfile.cpp b/src/aurora/nwscript/ncsfile.cpp
@@ -391,7 +391,7 @@ void NCSFile::executeStep() {
 	try {
 		(this->*(_opcodes[opcode].proc))(type);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 
 	_stack.print();
@@ -584,7 +584,7 @@ void NCSFile::o_logand(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg1 && arg2);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -597,7 +597,7 @@ void NCSFile::o_logor(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg1 || arg2);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -610,7 +610,7 @@ void NCSFile::o_incor(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg1 | arg2);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -623,7 +623,7 @@ void NCSFile::o_excor(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg1 ^ arg2);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -636,7 +636,7 @@ void NCSFile::o_booland(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg1 && arg2);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -668,7 +668,7 @@ void NCSFile::o_geq(InstructionType type) {
 				int32 arg2 = _stack.pop().getInt();
 				_stack.push(arg2 >= arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -678,7 +678,7 @@ void NCSFile::o_geq(InstructionType type) {
 				float arg2 = _stack.pop().getFloat();
 				_stack.push(arg2 >= arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -695,7 +695,7 @@ void NCSFile::o_gt(InstructionType type) {
 				int32 arg2 = _stack.pop().getInt();
 				_stack.push(arg2 > arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -705,7 +705,7 @@ void NCSFile::o_gt(InstructionType type) {
 				float arg2 = _stack.pop().getFloat();
 				_stack.push(arg2 > arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -722,7 +722,7 @@ void NCSFile::o_lt(InstructionType type) {
 				int32 arg2 = _stack.pop().getInt();
 				_stack.push(arg2 < arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -732,7 +732,7 @@ void NCSFile::o_lt(InstructionType type) {
 				float arg2 = _stack.pop().getFloat();
 				_stack.push(arg2 < arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -749,7 +749,7 @@ void NCSFile::o_leq(InstructionType type) {
 				int32 arg2 = _stack.pop().getInt();
 				_stack.push(arg2 <= arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -759,7 +759,7 @@ void NCSFile::o_leq(InstructionType type) {
 				float arg2 = _stack.pop().getFloat();
 				_stack.push(arg2 <= arg1);
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -777,7 +777,7 @@ void NCSFile::o_shleft(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg2 << arg1);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -790,7 +790,7 @@ void NCSFile::o_shright(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg2 >> arg1);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -805,7 +805,7 @@ void NCSFile::o_ushright(InstructionType type) {
 		int32 arg2 = _stack.pop().getInt();
 		_stack.push(arg2 >> arg1);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -824,7 +824,7 @@ void NCSFile::o_mod(InstructionType type) {
 
 		_stack.push(arg2 % arg1);
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 
@@ -834,15 +834,15 @@ void NCSFile::o_neg(InstructionType type) {
 			try {
 				_stack.push(-_stack.pop().getInt());
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
 		case kInstTypeFloat:
 			try {
 				_stack.push(-_stack.pop().getFloat());
 			} catch (Common::Exception &e) {
-				throw e;
+				throw;
 			}
 			break;
 
@@ -858,7 +858,7 @@ void NCSFile::o_comp(InstructionType type) {
 	try {
 		_stack.push(~_stack.pop().getInt());
 	} catch (Common::Exception &e) {
-		throw e;
+		throw;
 	}
 }
 

diff --git a/src/aurora/resman.cpp b/src/aurora/resman.cpp
@@ -334,7 +334,7 @@ void ResourceManager::mergeKEYBIF(const KEYFile &key, std::vector<Common::UStrin
 		delete curBIF;
 
 		e.add("Failed opening needed BIFs");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/rimfile.cpp b/src/aurora/rimfile.cpp
@@ -80,7 +80,7 @@ void RIMFile::load() {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading RIM file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/ssffile.cpp b/src/aurora/ssffile.cpp
@@ -95,7 +95,7 @@ void SSFFile::load(Common::SeekableReadStream &ssf) {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading SSF file");
-		throw e;
+		throw;
 	}
 
 }

diff --git a/src/aurora/talktable.cpp b/src/aurora/talktable.cpp
@@ -86,7 +86,7 @@ void TalkTable::load() {
 
 	} catch (Common::Exception &e) {
 		e.add("Failed reading TLK file");
-		throw e;
+		throw;
 	}
 
 }