Remove redundant diplayError function

libsidplayfp · Aug 13, 2024 · b4bea56 · b4bea56
1 parent 6a592d5
commit b4bea56
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 35 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -31,6 +31,8 @@ using std::endl;
 
 #include "keyboard.h"
 
+const char* ERR_SIGHANDLER = "ERROR: Could not install signal handler.";
+
 
 // Function prototypes
 static void sighandler (int signum);
@@ -58,7 +60,7 @@ int main(int argc, char *argv[])
      || (signal (SIGABRT, &sighandler) == SIG_ERR)
      || (signal (SIGTERM, &sighandler) == SIG_ERR))
     {
-        displayError(argv[0], errnum_t::SIGHANDLER);
+        player.displayError(ERR_SIGHANDLER);
         goto main_error;
     }
 
@@ -83,7 +85,7 @@ int main(int argc, char *argv[])
      || (signal (SIGABRT, SIG_DFL) == SIG_ERR)
      || (signal (SIGTERM, SIG_DFL) == SIG_ERR))
     {
-        displayError(argv[0], errnum_t::SIGHANDLER);
+        player.displayError(ERR_SIGHANDLER);
         goto main_error;
     }
 
@@ -112,22 +114,3 @@ void sighandler (int signum)
     default: break;
     }
 }
-
-
-void displayError (const char *arg0, errnum_t num)
-{
-    cerr << arg0 << ": ";
-
-    switch (num)
-    {
-    case errnum_t::NOT_ENOUGH_MEMORY:
-        cerr << "ERROR: Not enough memory." << endl;
-        break;
-
-    case errnum_t::SIGHANDLER:
-        cerr << "ERROR: Could not install signal handler." << endl;
-        break;
-
-    default: break;
-    }
-}
diff --git a/src/player.cpp b/src/player.cpp
@@ -65,6 +65,10 @@ using std::endl;
 // Previous song select timeout (4 secs)
 #define SID2_PREV_SONG_TIMEOUT 4000
 
+
+const char* ERR_NOT_ENOUGH_MEMORY = "ERROR: Not enough memory.";
+
+
 #ifdef HAVE_SIDPLAYFP_BUILDERS_RESIDFP_H
 #  include <sidplayfp/builders/residfp.h>
 const char ConsolePlayer::RESIDFP_ID[] = "ReSIDfp";
@@ -530,7 +534,7 @@ bool ConsolePlayer::createOutput (output_t driver, const SidTuneInfo *tuneInfo)
     if (!m_driver.device)
     {
         m_driver.device = &m_driver.null;
-        displayError (errnum_t::NOT_ENOUGH_MEMORY);
+        displayError (ERR_NOT_ENOUGH_MEMORY);
         return false;
     }
 
@@ -743,7 +747,7 @@ bool ConsolePlayer::createSidEmu (SIDEMUS emu, const SidTuneInfo *tuneInfo)
     {
         if (emu > EMU_DEFAULT)
         {   // No sid emulation?
-            displayError (errnum_t::NOT_ENOUGH_MEMORY);
+            displayError (ERR_NOT_ENOUGH_MEMORY);
             return false;
         }
     }

diff --git a/src/player.h b/src/player.h
@@ -113,13 +113,6 @@ enum class output_t
     END
 };
 
-// Error and status message numbers.
-enum class errnum_t
-{
-    NOT_ENOUGH_MEMORY,
-    SIGHANDLER
-};
-
 // Songlength DB.
 enum class sldb_t
 {
@@ -128,9 +121,6 @@ enum class sldb_t
     MD5
 };
 
-void displayError (const char *arg0, errnum_t num);
-
-
 // Grouped global variables
 class ConsolePlayer
 {
@@ -248,8 +238,6 @@ class ConsolePlayer
 
     bool createOutput   (output_t driver, const SidTuneInfo *tuneInfo);
     bool createSidEmu   (SIDEMUS emu, const SidTuneInfo *tuneInfo);
-    void displayError   (const char *error);
-    void displayError   (errnum_t num) { ::displayError (m_name, num); }
     void decodeKeys     (void);
     void updateDisplay();
     void emuflush       (void);
@@ -269,6 +257,8 @@ class ConsolePlayer
     ConsolePlayer (const char * const name);
     virtual ~ConsolePlayer() = default;
 
+    void displayError(const char *error);
+
     int  args  (int argc, const char *argv[]);
     bool open  (void);
     void close (void);