Remove unused exit codes

diff --git a/include/exitcodes.h b/include/exitcodes.h
index 888431969e871e6e3cb794234895bfd63d9fcf2f..b1090d1414c438ed91c1a7e11841246d0d0b0dfe 100644 (file)
--- a/include/exitcodes.h
+++ b/include/exitcodes.h
@@ -27,24 +27,15 @@ enum ExitStatus
 {
        EXIT_STATUS_NOERROR = 0,                /* No error */
        EXIT_STATUS_DIE = 1,                    /* Operator issued DIE */
-       EXIT_STATUS_FAILED_EXEC = 2,            /* execv() failed */
-       EXIT_STATUS_INTERNAL = 3,               /* Internal error */
-       EXIT_STATUS_CONFIG = 4,                 /* Config error */
-       EXIT_STATUS_LOG = 5,                    /* Log file error */
-       EXIT_STATUS_FORK = 6,                   /* fork() failed */
-       EXIT_STATUS_ARGV = 7,                   /* Invalid program arguments */
-       EXIT_STATUS_BIND = 8,                   /* Port binding failed on all ports */
-       EXIT_STATUS_PID = 9,                    /* Couldn't write PID file */
-       EXIT_STATUS_SOCKETENGINE = 10,          /* Couldn't start socket engine */
-       EXIT_STATUS_ROOT = 11,                  /* Refusing to start as root */
-       EXIT_STATUS_DIETAG = 12,                /* Found a die tag in the config file */
-       EXIT_STATUS_MODULE = 13,                /* Couldn't load a required module */
-       EXIT_STATUS_CREATEPROCESS = 14,         /* CreateProcess failed (windows) */
-       EXIT_STATUS_SIGTERM = 15,               /* Note: dont move this value. It corresponds with the value of #define SIGTERM. */
-       EXIT_STATUS_BADHANDLER = 16,            /* Bad command handler loaded */
-       EXIT_STATUS_RSCH_FAILED = 17,           /* Windows service specific failure, will name these later */
-       EXIT_STATUS_UPDATESCM_FAILED = 18,      /* Windows service specific failure, will name these later */
-       EXIT_STATUS_CREATE_EVENT_FAILED = 19    /* Windows service specific failure, will name these later */
+       EXIT_STATUS_CONFIG = 2,                 /* Config error */
+       EXIT_STATUS_LOG = 3,                    /* Log file error */
+       EXIT_STATUS_FORK = 4,                   /* fork() failed */
+       EXIT_STATUS_ARGV = 5,                   /* Invalid program arguments */
+       EXIT_STATUS_PID = 6,                    /* Couldn't write PID file */
+       EXIT_STATUS_SOCKETENGINE = 7,   /* Couldn't start socket engine */
+       EXIT_STATUS_ROOT = 8,                   /* Refusing to start as root */
+       EXIT_STATUS_MODULE = 9,                 /* Couldn't load a required module */
+       EXIT_STATUS_SIGTERM = 10                /* Received SIGTERM */
 };
 
 /** Array that maps exit codes (ExitStatus types) to

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 4e4b3f5e2796bbe6853b2aa5e7ef028164e1f3ab..97d95f9bd3820b23c68bc1e2a7fffc27bda9ff60 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -77,26 +77,17 @@ unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map;
  */
 const char* ExitCodes[] =
 {
-               "No error", /* 0 */
-               "DIE command", /* 1 */
-               "execv() failed", /* 2 */
-               "Internal error", /* 3 */
-               "Config file error", /* 4 */
-               "Logfile error", /* 5 */
-               "POSIX fork failed", /* 6 */
-               "Bad commandline parameters", /* 7 */
-               "No ports could be bound", /* 8 */
-               "Can't write PID file", /* 9 */
-               "SocketEngine could not initialize", /* 10 */
-               "Refusing to start up as root", /* 11 */
-               "Found a <die> tag!", /* 12 */
-               "Couldn't load module on startup", /* 13 */
-               "Could not create windows forked process", /* 14 */
-               "Received SIGTERM", /* 15 */
-               "Bad command handler loaded", /* 16 */
-               "RegisterServiceCtrlHandler failed", /* 17 */
-               "UpdateSCMStatus failed", /* 18 */
-               "CreateEvent failed" /* 19 */
+               "No error",                                                             // 0
+               "DIE command",                                                  // 1
+               "Config file error",                                    // 2
+               "Logfile error",                                                // 3
+               "POSIX fork failed",                                    // 4
+               "Bad commandline parameters",                   // 5
+               "Can't write PID file",                                 // 6
+               "SocketEngine could not initialize",    // 7
+               "Refusing to start up as root",                 // 8
+               "Couldn't load module on startup",              // 9
+               "Received SIGTERM"                                              // 10
 };
 
 template<typename T> static void DeleteZero(T*&n)

diff --git a/src/server.cpp b/src/server.cpp
index 55c230f9694af47cf289c0bda502cc1520fa85fb..580ee5310c0616fd9548c872d5387e3aa6d74925 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -36,7 +36,7 @@ void InspIRCd::SignalHandler(int signal)
        else if (signal == SIGTERM)
 #endif
        {
-               Exit(signal);
+               Exit(EXIT_STATUS_SIGTERM);
        }
 }