Unify exceptions.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
jvernet · Dec 18, 2021 · 9130816 · 9130816
1 parent 9590d7c
commit 9130816
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 20 deletions.
diff --git a/source/frontends/libretro/libretro.cpp b/source/frontends/libretro/libretro.cpp
@@ -334,10 +334,6 @@ bool retro_load_game(const retro_game_info *info)
   {
     ra2::log_cb(RETRO_LOG_INFO, "Exception: %s\n", e.what());
   }
-  catch (const std::string & s)
-  {
-    ra2::log_cb(RETRO_LOG_INFO, "Exception: %s\n", s.c_str());
-  }
 
   return false;
 }

diff --git a/source/frontends/ncurses/main.cpp b/source/frontends/ncurses/main.cpp
@@ -183,14 +183,4 @@ int main(int argc, const char * argv [])
     std::cerr << e.what() << std::endl;
     return 1;
   }
-  catch (const std::string & e)
-  {
-    std::cerr << e << std::endl;
-    return 1;
-  }
-  catch (int e)
-  {
-    std::cerr << "Exit process called: " << e << std::endl;
-    return e;
-  }
 }
diff --git a/source/linux/duplicates/FourPlay.cpp b/source/linux/duplicates/FourPlay.cpp
@@ -22,7 +22,7 @@ void FourPlayCard::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
 bool FourPlayCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	return true;
 }
diff --git a/source/linux/duplicates/SNESMAX.cpp b/source/linux/duplicates/SNESMAX.cpp
@@ -24,7 +24,7 @@ void SNESMAXCard::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
 bool SNESMAXCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
 	if (version < 1 || version > kUNIT_VERSION)
-		throw std::string("Card: wrong version");
+		throw std::runtime_error("Card: wrong version");
 
 	return true;
 }
diff --git a/source/linux/duplicates/SerialComms.cpp b/source/linux/duplicates/SerialComms.cpp
@@ -57,7 +57,7 @@ static const UINT kUNIT_VERSION = 2;
 void CSuperSerialCard::LoadSnapshotDIPSW(YamlLoadHelper& yamlLoadHelper, std::string key, SSC_DIPSW& dipsw)
 {
   if (!yamlLoadHelper.GetSubMap(key))
-    throw std::string("Card: Expected key: " + key);
+    throw std::runtime_error("Card: Expected key: " + key);
 
   yamlLoadHelper.LoadUint(SS_YAML_KEY_BAUDRATE);
   yamlLoadHelper.LoadUint(SS_YAML_KEY_FWMODE);
@@ -73,7 +73,7 @@ void CSuperSerialCard::LoadSnapshotDIPSW(YamlLoadHelper& yamlLoadHelper, std::st
 bool CSuperSerialCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT version)
 {
   if (version < 1 || version > kUNIT_VERSION)
-    throw std::string("Card: wrong version");
+    throw std::runtime_error("Card: wrong version");
 
   SSC_DIPSW dipsw;
   LoadSnapshotDIPSW(yamlLoadHelper, SS_YAML_KEY_DIPSWDEFAULT, dipsw);

diff --git a/source/linux/libwindows/winbase.cpp b/source/linux/libwindows/winbase.cpp
@@ -5,6 +5,7 @@
 #include <chrono>
 #include <thread>
 #include <unistd.h>
+#include <sstream>
 
 
 DWORD       WINAPI GetLastError(void)
@@ -42,7 +43,10 @@ void OutputDebugString(const char * str)
 
 void ExitProcess(int status)
 {
-  throw status;
+  std::ostringstream buffer("ExitProcess: ");
+  buffer << status;
+
+  throw std::runtime_error(buffer.str());
 }
 
 DWORD       WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD)

diff --git a/source/linux/libwindows/winuser.cpp b/source/linux/libwindows/winuser.cpp
@@ -1,5 +1,7 @@
 #include "winuser.h"
 
+#include <sstream>
+
 HCURSOR LoadCursor(HINSTANCE hInstance, LPCSTR lpCursorName)
 {
   return nullptr;
@@ -32,5 +34,8 @@ LRESULT     WINAPI SendMessage(HWND,UINT,WPARAM,LPARAM)
 
 void        WINAPI PostQuitMessage(INT status)
 {
-  throw status;
+  std::ostringstream buffer("PostQuitMessage: ");
+  buffer << status;
+
+  throw std::runtime_error(buffer.str());
 }