Merge pull request #586 from zrax/gcc9_warn

Warning cleanup
H-uru · Jul 3, 2019 · 7bdab86 · 7bdab86
2 parents 010baa1 + 87f6df6
commit 7bdab86
Show file tree

Hide file tree

Showing 23 changed files with 900 additions and 893 deletions.
diff --git a/Sources/Plasma/CoreLib/HeadSpin.cpp b/Sources/Plasma/CoreLib/HeadSpin.cpp
@@ -120,7 +120,7 @@ void ErrorEnableGui(bool enabled)
     s_GuiAsserts = enabled;
 }
 
-void ErrorAssert(int line, const char* file, const char* fmt, ...)
+NORETURN void ErrorAssert(int line, const char* file, const char* fmt, ...)
 {
 #if defined(HS_DEBUGGING) || !defined(PLASMA_EXTERNAL_RELEASE)
     char msg[1024];
@@ -146,6 +146,9 @@ void ErrorAssert(int line, const char* file, const char* fmt, ...)
 #else
     DebugBreakIfDebuggerPresent();
 #endif // defined(HS_DEBUGGING) || !defined(PLASMA_EXTERNAL_RELEASE)
+
+    // If no debugger break occurred, just crash.
+    std::abort();
 }
 
 bool DebugIsDebuggerPresent()

diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h
@@ -409,8 +409,10 @@ inline float hsRadiansToDegrees(float rad) { return float(rad * (180 / M_PI)); }
 
 #ifdef _MSC_VER
 #   define ALIGN(n) __declspec(align(n))
+#   define NORETURN __declspec(noreturn)
 #else
 #   define ALIGN(n) __attribute__((aligned(n)))
+#   define NORETURN __attribute__((noreturn))
 #endif
 
 /************************ Debug/Error Macros **************************/
@@ -424,7 +426,7 @@ extern hsDebugMessageProc gHSStatusProc;
 hsDebugMessageProc hsSetStatusMessageProc(hsDebugMessageProc newProc);
 
 void ErrorEnableGui (bool enabled);
-void ErrorAssert (int line, const char* file, const char* fmt, ...);
+NORETURN void ErrorAssert (int line, const char* file, const char* fmt, ...);
 
 bool DebugIsDebuggerPresent();
 void DebugBreakIfDebuggerPresent();

diff --git a/Sources/Plasma/CoreLib/plFileSystem.cpp b/Sources/Plasma/CoreLib/plFileSystem.cpp
@@ -535,7 +535,7 @@ plFileName plFileSystem::GetCurrentAppPath()
     if (appPath.IsValid())
         return appPath;
 
-    hsAssert(0, "Your OS doesn't make life easy, does it?");
+    FATAL("Your OS doesn't make life easy, does it?");
 #endif
 }
 

diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
@@ -551,7 +551,10 @@ void    pfConsole::IHandleKey( plKeyEventMsg *msg )
             if( fWorkingLine[ 0 ] == 0 )
                 IPrintSomeHelp();
             else if( stricmp( fWorkingLine, "commands" ) == 0 )
-                fEngine->PrintCmdHelp( "", IAddLineCallback );
+            {
+                char empty[] = "";
+                fEngine->PrintCmdHelp( empty, IAddLineCallback );
+            }
             else if( !fEngine->PrintCmdHelp( fWorkingLine, IAddLineCallback ) )
             {
                 c = (char *)fEngine->GetErrorMsg();

diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
@@ -1012,8 +1012,7 @@ PyObject* cyMisc::GetNPC(int npcID)
     if ( so )
         return pySceneObject::New(so->GetKey());
 
-    char* errmsg = "NPC not found";
-    PyErr_SetString(PyExc_NameError, errmsg);
+    PyErr_SetString(PyExc_NameError, "NPC not found");
     PYTHON_RETURN_ERROR;
 }
 
@@ -2369,7 +2368,8 @@ class NetClientCommCallback : public plNetClientComm::Callback
                             PyTuple_SetItem(t, 1, PyLong_FromUnsignedLong(nPlayers));
                             PyList_SetItem(pyEL, i, t); // steals the ref
                         }
-                        PyObject* retVal = PyObject_CallMethod(fPyObject, "gotPublicAgeList", "O", pyEL);
+                        PyObject* retVal = PyObject_CallMethod(fPyObject,
+                                                _pycs("gotPublicAgeList"), _pycs("O"), pyEL);
                         Py_XDECREF(retVal);
                     }
                 }
@@ -2387,7 +2387,8 @@ class NetClientCommCallback : public plNetClientComm::Callback
                     if ( ageInfo )
                     {
                         PyObject* ageInfoObj = pyAgeInfoStruct::New(ageInfo);
-                        PyObject* retVal = PyObject_CallMethod(fPyObject, "publicAgeCreated", "O", ageInfoObj);
+                        PyObject* retVal = PyObject_CallMethod(fPyObject,
+                                                _pycs("publicAgeCreated"), _pycs("O"), ageInfoObj);
                         Py_XDECREF(retVal);
                         Py_DECREF(ageInfoObj);
                     }
@@ -2405,7 +2406,9 @@ class NetClientCommCallback : public plNetClientComm::Callback
 
                     if ( guid )
                     {
-                        PyObject* retVal = PyObject_CallMethod(fPyObject, "publicAgeRemoved", "s", guid->AsString().c_str());
+                        PyObject* retVal = PyObject_CallMethod(fPyObject,
+                                                _pycs("publicAgeRemoved"), _pycs("s"),
+                                                guid->AsString().c_str());
                         Py_XDECREF(retVal);
                     }
                 }

diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp
@@ -1021,7 +1021,7 @@ void PythonInterface::initPython()
         FirstTimeInit = false;
         // initialize the Python stuff
         // let Python do some initialization...
-        Py_SetProgramName("plasma");
+        Py_SetProgramName(_pycs("plasma"));
         Py_NoSiteFlag = 1;
         Py_IgnoreEnvironmentFlag = 1;
         Py_Initialize();
@@ -1644,7 +1644,7 @@ int PythonInterface::getOutputAndReset(std::string *output)
         if ( dbgOut != nil )
         {
             // then send it the new text
-            PyObject* retVal = PyObject_CallFunction(dbgOut,"s",strVal.c_str());
+            PyObject* retVal = PyObject_CallFunction(dbgOut, _pycs("s"), strVal.c_str());
             if ( retVal == nil )
             {
                 // for some reason this function didn't, remember that and not call it again
@@ -1778,7 +1778,7 @@ PyObject* PythonInterface::CreateModule(const char* module)
 //
 //  PURPOSE    : get an item (probably a function) from the Plasma module
 //
-PyObject* PythonInterface::GetPlasmaItem(char* item)
+PyObject* PythonInterface::GetPlasmaItem(const char* item)
 {
     if ( plasmaMod )
     {
@@ -1796,7 +1796,7 @@ PyObject* PythonInterface::GetPlasmaItem(char* item)
 //
 //  PURPOSE    : get an item (probably a function) from a specific module
 //
-PyObject* PythonInterface::GetModuleItem(char* item, PyObject* module)
+PyObject* PythonInterface::GetModuleItem(const char* item, PyObject* module)
 {
     if ( module )
     {

diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h
@@ -141,12 +141,12 @@ class  PythonInterface
 
     // checks to see if a specific function is defined in this module
     // get an item (probably a function) from the Plasma module
-    static PyObject* GetPlasmaItem(char* item);
+    static PyObject* GetPlasmaItem(const char* item);
 
     // Determine if the module name is unique
     static bool IsModuleNameUnique(const ST::string& module);
     // get an item (probably a function) from a specific module
-    static PyObject* GetModuleItem(char* item, PyObject* module);
+    static PyObject* GetModuleItem(const char* item, PyObject* module);
 
     // check a specific module for the define funcitons
     static void CheckModuleForFunctions(PyObject* module, char** funcNames, PyObject** funcTable);