jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-06 08:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Heavy patching for compiler warnings.

Browse Source 
The vast majority of this is fixing up `char *` that should be `const char *`
but a handful of other fixes, like potential buffer overflows that GCC
noticed, etc, were applied as well.

This removes `-Wno-write-strings` from CMakeLists.txt, as it is no longer
necessary, as there is no longer a flood of compiler warning spam when
building.

This does not fix all compiler warnings; there are still a handful, and they
are legitimate, but they can be dealt with in a future commit.
This commit is contained in:
Ryan C. Gordon
2024-04-28 00:39:29 -04:00
parent 9d2aa8d809
commit 6c8977caf0
300 changed files with 2053 additions and 2031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/editor/ScriptCompilerAPI.cpp
View File

@@ -369,7 +369,7 @@ bool ScriptCreateEmptyLevelScript(char *filename)
O(("#endif"));
O(("char STDCALL InitializeDLL(tOSIRISModuleInit *func_list);"));
O(("void STDCALL ShutdownDLL(void);"));
O(("int STDCALL GetGOScriptID(char *name,ubyte is_door);"));
O(("int STDCALL GetGOScriptID(const char *name,ubyte is_door);"));
O(("void STDCALLPTR CreateInstance(int id);"));
O(("void STDCALL DestroyInstance(int id,void *ptr);"));
O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);"));
@@ -383,9 +383,9 @@ bool ScriptCreateEmptyLevelScript(char *filename)
O(("int String_table_size = 0;"));
O(("char **String_table = NULL;"));
O(("static char *_Error_string = \"!!ERROR MISSING STRING!!\";"));
O(("static char *_Empty_string = \"\";"));
O(("char *GetStringFromTable(int index)"));
O(("static const char *_Error_string = \"!!ERROR MISSING STRING!!\";"));
O(("static const char *_Empty_string = \"\";"));
O(("const char *GetStringFromTable(int index)"));
O(("{"));
O((" if( (index<0) || (index>=String_table_size) )"));
O((" return _Error_string;"));
@@ -442,7 +442,7 @@ bool ScriptCreateEmptyLevelScript(char *filename)
O(("// door, else it is a 0. The return value is the unique identifier, else -1 if the script"));
O(("// does not exist in the DLL."));
O(("// The only reserved ID is 0, which must be used for the level script"));
O(("int STDCALL GetGOScriptID(char *name,ubyte isdoor)"));
O(("int STDCALL GetGOScriptID(const char *name,ubyte isdoor)"));
O(("{"));
O((" return -1;"));
O(("}"));
@@ -568,7 +568,7 @@ bool ScriptCreateEmptyGameScript(char *filename)
O(("#endif"));
O(("char STDCALL InitializeDLL(tOSIRISModuleInit *func_list);"));
O(("void STDCALL ShutdownDLL(void);"));
O(("int STDCALL GetGOScriptID(char *name,ubyte isdoor);"));
O(("int STDCALL GetGOScriptID(const char *name,ubyte isdoor);"));
O(("void STDCALLPTR CreateInstance(int id);"));
O(("void STDCALL DestroyInstance(int id,void *ptr);"));
O(("short STDCALL CallInstanceEvent(int id,void *ptr,int event,tOSIRISEventInfo *data);"));
@@ -582,7 +582,7 @@ bool ScriptCreateEmptyGameScript(char *filename)
O(("char **String_table = NULL;"));
O(("static char *_Error_string = \"!!ERROR MISSING STRING!!\";"));
O(("static char *_Empty_string = \"\";"));
O(("char *GetStringFromTable(int index)"));
O(("const char *GetStringFromTable(int index)"));
O(("{"));
O((" if( (index<0) || (index>=String_table_size) )"));
O((" return _Error_string;"));
@@ -638,7 +638,7 @@ bool ScriptCreateEmptyGameScript(char *filename)
O(("// or OBJ_ROBOT), therefore, a 1 is passed in for isdoor if the given object name refers to a"));
O(("// door, else it is a 0. The return value is the unique identifier, else -1 if the script"));
O(("// does not exist in the DLL."));
O(("int STDCALL GetGOScriptID(char *name,ubyte isdoor)"));
O(("int STDCALL GetGOScriptID(const char *name,ubyte isdoor)"));
O(("{"));
O((" return -1;"));
O(("}"));