From 7919071a25449e9dce8d781037f7d1dbf5e58aae Mon Sep 17 00:00:00 2001
From: Matthew Budd <mjbudd77@gmail.com>
Date: Fri, 19 Jun 2020 23:58:12 -0400
Subject: [PATCH] =?UTF-8?q?Cleaned=20up=20gcc=20compiler=20warning=20:=20I?=
 =?UTF-8?q?SO=20C++=20forbids=20converting=20a=20string=20constant=20to=20?=
 =?UTF-8?q?=E2=80=98char*=E2=80=99=20[-Wwrite-strings]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cheat.h                      |  4 ++--
 src/driver.h                     |  4 ++--
 src/drivers/common/cheat.cpp     |  6 +++---
 src/drivers/sdl/config.cpp       |  2 +-
 src/drivers/sdl/input.cpp        |  2 +-
 src/drivers/sdl/sdl.cpp          |  6 +++---
 src/drivers/sdl/unix-netplay.cpp |  2 +-
 src/fceu.cpp                     |  6 ++++--
 src/fceu.h                       |  8 ++++----
 src/file.cpp                     |  2 +-
 src/file.h                       |  2 +-
 src/ines.cpp                     |  6 +++---
 src/ines.h                       |  2 +-
 src/input.h                      |  2 +-
 src/lua-engine.cpp               |  8 +++++---
 src/movie.cpp                    |  2 +-
 src/movie.h                      |  2 +-
 src/nsf.cpp                      |  2 +-
 src/state.cpp                    |  8 ++++----
 src/state.h                      |  4 ++--
 src/unif.cpp                     | 10 +++++-----
 src/utils/xstring.cpp            |  2 +-
 src/utils/xstring.h              |  4 ++--
 src/video.cpp                    |  6 +++---
 src/vsuni.cpp                    |  2 +-
 25 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/src/cheat.h b/src/cheat.h
index 4ea6f12c..9f3dbe2b 100644
--- a/src/cheat.h
+++ b/src/cheat.h
@@ -40,7 +40,7 @@ typedef struct {
 
 struct CHEATF {
 	struct CHEATF *next;
-	char *name = "";
+	char *name;
 	uint16 addr;
 	uint8 val;
 	int compare;	/* -1 for no compare. */
@@ -65,4 +65,4 @@ struct SEARCHPOSSIBLE {
 #define FCEU_SEARCH_NEWVAL_GT_KNOWN         7
 #define FCEU_SEARCH_NEWVAL_LT_KNOWN         8
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/driver.h b/src/driver.h
index 496ab636..d3f1f020 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -23,7 +23,7 @@ ArchiveScanRecord FCEUD_ScanArchive(std::string fname);
 const char *FCEUD_GetCompilerString();
 
 //This makes me feel dirty for some reason.
-void FCEU_printf(char *format, ...);
+void FCEU_printf(const char *format, ...);
 #define FCEUI_printf FCEU_printf
 
 //Video interface
@@ -183,7 +183,7 @@ void FCEUD_LuaRunFrom(void);
 int32 FCEUI_GetDesiredFPS(void);
 void FCEUI_SaveSnapshot(void);
 void FCEUI_SaveSnapshotAs(void);
-void FCEU_DispMessage(char *format, int disppos, ...);
+void FCEU_DispMessage(const char *format, int disppos, ...);
 #define FCEUI_DispMessage FCEU_DispMessage
 
 int FCEUI_DecodePAR(const char *code, int *a, int *v, int *c, int *type);
diff --git a/src/drivers/common/cheat.cpp b/src/drivers/common/cheat.cpp
index b03edad9..f985876e 100644
--- a/src/drivers/common/cheat.cpp
+++ b/src/drivers/common/cheat.cpp
@@ -176,7 +176,7 @@ int AddToList(char *text, uint32 id)
 **/
 
 typedef struct MENU {
-	char *text;
+	const char *text;
 	void *action;
 	int type;	// 0 for menu, 1 for function.
 } MENU;
@@ -392,7 +392,7 @@ static void ShowRes(void)
  }
 }
 
-static int ShowShortList(char *moe[], int n, int def)
+static int ShowShortList(const char *moe[], int n, int def)
 {
  int x,c;
  int baa; //mbg merge 7/17/06 made to normal int
@@ -430,7 +430,7 @@ static void DoSearch(void)
 {
  static int v1=0,v2=0;
  static int method=0;
- char *m[9]={"O==V1 && C==V2",
+ const char *m[9]={"O==V1 && C==V2",
    "O==V1 && |O-C|==V2",
    "|O-C|==V2",
    "O!=C",
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index 9774e0d0..4856cbb2 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -102,7 +102,7 @@ LoadCPalette(const std::string &file)
 static void
 CreateDirs(const std::string &dir)
 {
-	char *subs[8]={"fcs","snaps","gameinfo","sav","cheats","movies","cfg.d"};
+	const char *subs[8]={"fcs","snaps","gameinfo","sav","cheats","movies","cfg.d"};
 	std::string subdir;
 	int x;
 
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index f4246e96..9e7280c9 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -1808,7 +1808,7 @@ void ConfigDevice (int which, int arg)
 	char buf[256];
 	int x;
 	std::string prefix;
-	char *str[10] =
+	const char *str[10] =
 	{ "A", "B", "SELECT", "START", "UP", "DOWN", "LEFT", "RIGHT", "Rapid A",
 		"Rapid B"
 	};
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index fb421832..dd3d1c83 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -493,12 +493,12 @@ FILE *FCEUD_UTF8fopen(const char *fn, const char *mode)
 	return(fopen(fn,mode));
 }
 
-static char *s_linuxCompilerString = "g++ " __VERSION__;
+static const char *s_linuxCompilerString = "g++ " __VERSION__;
 /**
  * Returns the compiler string.
  */
 const char *FCEUD_GetCompilerString() {
-	return (const char *)s_linuxCompilerString;
+	return s_linuxCompilerString;
 }
 
 /**
@@ -590,7 +590,7 @@ int main(int argc, char *argv[])
 		else if(strcmp(argv[i], "--nogui") == 0)
 		{
 			noGui = 1;
-			argv[i] = "";
+			//argv[i] = "";
 		}
 #endif
 	}
diff --git a/src/drivers/sdl/unix-netplay.cpp b/src/drivers/sdl/unix-netplay.cpp
index 66f8a687..b1d732a6 100644
--- a/src/drivers/sdl/unix-netplay.cpp
+++ b/src/drivers/sdl/unix-netplay.cpp
@@ -117,7 +117,7 @@ FCEUD_NetworkConnect(void)
 
 	TSocket = socket(AF_INET, SOCK_STREAM, 0);
 	if(TSocket < 0) {
-		char* s = "Error creating stream socket.";
+		const char* s = "Error creating stream socket.";
 		puts(s);
 		FCEU_DispMessage(s,0);
 		FCEUD_NetworkClose();
diff --git a/src/fceu.cpp b/src/fceu.cpp
index f97595d4..90e295bd 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -980,7 +980,8 @@ void FCEU_ResetVidSys(void) {
 
 FCEUS FSettings;
 
-void FCEU_printf(char *format, ...) {
+void FCEU_printf(const char *format, ...) 
+{
 	char temp[2048];
 
 	va_list ap;
@@ -999,7 +1000,8 @@ void FCEU_printf(char *format, ...) {
 	va_end(ap);
 }
 
-void FCEU_PrintError(char *format, ...) {
+void FCEU_PrintError(const char *format, ...) 
+{
 	char temp[2048];
 
 	va_list ap;
diff --git a/src/fceu.h b/src/fceu.h
index a15da070..a9075f4f 100644
--- a/src/fceu.h
+++ b/src/fceu.h
@@ -133,10 +133,10 @@ extern FCEUS FSettings;
 
 bool CheckFileExists(const char* filename);	//Receives a filename (fullpath) and checks to see if that file exists
 
-void FCEU_PrintError(char *format, ...);
-void FCEU_printf(char *format, ...);
-void FCEU_DispMessage(char *format, int disppos, ...);
-void FCEU_DispMessageOnMovie(char *format, ...);
+void FCEU_PrintError(const char *format, ...);
+void FCEU_printf(const char *format, ...);
+void FCEU_DispMessage(const char *format, int disppos, ...);
+void FCEU_DispMessageOnMovie(const char *format, ...);
 void FCEU_TogglePPU();
 
 void SetNESDeemph_OldHacky(uint8 d, int force);
diff --git a/src/file.cpp b/src/file.cpp
index dfbba02e..0aeb6ae2 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -260,7 +260,7 @@ zpfail:
 	return 0;
 }
 
-FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn, char *mode, char *ext, int index, const char** extensions, int* userCancel)
+FCEUFILE * FCEU_fopen(const char *path, const char *ipsfn, const char *mode, char *ext, int index, const char** extensions, int* userCancel)
 {
 	FILE *ipsfile=0;
 	FCEUFILE *fceufp=0;
diff --git a/src/file.h b/src/file.h
index f5dcf426..84235f70 100644
--- a/src/file.h
+++ b/src/file.h
@@ -122,7 +122,7 @@ struct ArchiveScanRecord
 };
 
 
-FCEUFILE *FCEU_fopen(const char *path, const char *ipsfn, char *mode, char *ext, int index=-1, const char** extensions = 0, int* userCancel = 0);
+FCEUFILE *FCEU_fopen(const char *path, const char *ipsfn, const char *mode, char *ext, int index=-1, const char** extensions = 0, int* userCancel = 0);
 bool FCEU_isFileInArchive(const char *path);
 int FCEU_fclose(FCEUFILE*);
 uint64 FCEU_fread(void *ptr, size_t size, size_t nmemb, FCEUFILE*);
diff --git a/src/ines.cpp b/src/ines.cpp
index 48f00b61..1b75ae07 100644
--- a/src/ines.cpp
+++ b/src/ines.cpp
@@ -233,7 +233,7 @@ static void SetInput(void) {
 
 struct BADINF {
 	uint64 md5partial;
-	char *name;
+	const char *name;
 	uint32 type;
 };
 
@@ -417,7 +417,7 @@ static void CheckHInfo(void) {
 		if (tofix & 1)
 			sprintf(gigastr + strlen(gigastr), "The mapper number should be set to %d.  ", MapperNo);
 		if (tofix & 2) {
-			char *mstr[3] = { "Horizontal", "Vertical", "Four-screen" };
+			const char *mstr[3] = { "Horizontal", "Vertical", "Four-screen" };
 			sprintf(gigastr + strlen(gigastr), "Mirroring should be set to \"%s\".  ", mstr[Mirroring & 3]);
 		}
 		if (tofix & 4)
@@ -839,7 +839,7 @@ int iNESLoad(const char *name, FCEUFILE *fp, int OverwriteVidMode) {
 		FCEU_printf("\n");
 	}
 
-	char* mappername = "Not Listed";
+	const char* mappername = "Not Listed";
 
 	for (int mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++) {
 		if (bmap[mappertest].number == MapperNo) {
diff --git a/src/ines.h b/src/ines.h
index f82f7a86..6ad2657b 100644
--- a/src/ines.h
+++ b/src/ines.h
@@ -270,7 +270,7 @@ void Mapper254_Init(CartInfo *);
 void Mapper406_Init(CartInfo *);
 
 typedef struct {
-	char *name;
+	const char *name;
 	int32 number;
 	void (*init)(CartInfo *);
 } BMAPPINGLocal;
diff --git a/src/input.h b/src/input.h
index b3c4199a..d2eb2053 100644
--- a/src/input.h
+++ b/src/input.h
@@ -295,7 +295,7 @@ struct EMUCMDTABLE
 	EMUCMDFN* fn_on;
 	EMUCMDFN* fn_off;
 	int state;
-	char* name;
+	const char* name;
 	int flags; //EMUCMDFLAG
 };
 
diff --git a/src/lua-engine.cpp b/src/lua-engine.cpp
index 76f99cb3..645eaf31 100644
--- a/src/lua-engine.cpp
+++ b/src/lua-engine.cpp
@@ -515,6 +515,7 @@ static int emu_getdir(lua_State *L) {
 
 	return 1;
 #endif
+	return 0;
 }
 
 
@@ -545,6 +546,7 @@ static int emu_loadrom(lua_State *L) {
 		return 1;
 	}
 #endif
+	return 1;
 }
 
 
@@ -5227,7 +5229,7 @@ static int doPopup(lua_State *L, const char* deftype, const char* deficon) {
 	return 1;
 #else
 
-	char *t;
+	const char *t;
 #ifdef __linux
 
 	int pid; // appease compiler
@@ -5285,9 +5287,9 @@ static int doPopup(lua_State *L, const char* deftype, const char* deficon) {
 
 		// I'm gonna be dead in a matter of microseconds anyways, so wasted memory doesn't matter to me.
 		// Go ahead and abuse strdup.
-		char * parameters[] = {"xmessage", "-buttons", t, strdup(str), NULL};
+		const char * parameters[] = {"xmessage", "-buttons", t, strdup(str), NULL};
 
-		execvp("xmessage", parameters);
+		execvp("xmessage", (char* const*)parameters);
 
 		// Aw shitty
 		perror("exec xmessage");
diff --git a/src/movie.cpp b/src/movie.cpp
index 4ba7e29c..0a33f5f0 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -2000,7 +2000,7 @@ void ProcessSubtitles(void)
 	}
 }
 
-void FCEU_DisplaySubtitles(char *format, ...)
+void FCEU_DisplaySubtitles(const char *format, ...)
 {
 	va_list ap;
 
diff --git a/src/movie.h b/src/movie.h
index 0824db17..10b7979a 100644
--- a/src/movie.h
+++ b/src/movie.h
@@ -309,7 +309,7 @@ void FCEUI_ToggleInputDisplay(void);
 
 void LoadSubtitles(MovieData &);
 void ProcessSubtitles(void);
-void FCEU_DisplaySubtitles(char *format, ...);
+void FCEU_DisplaySubtitles(const char *format, ...);
 
 void poweron(bool shouldDisableBatteryLoading);
 
diff --git a/src/nsf.cpp b/src/nsf.cpp
index 453e4fa9..129e045d 100644
--- a/src/nsf.cpp
+++ b/src/nsf.cpp
@@ -262,7 +262,7 @@ int NSFLoad(const char *name, FCEUFILE *fp)
 	FCEU_printf(" Name:       %s\n Artist:     %s\n Copyright:  %s\n\n",NSFHeader.SongName,NSFHeader.Artist,NSFHeader.Copyright);
 	if(NSFHeader.SoundChip)
 	{
-		static char *tab[6]={"Konami VRCVI","Konami VRCVII","Nintendo FDS","Nintendo MMC5","Namco 106","Sunsoft FME-07"};
+		static const char *tab[6]={"Konami VRCVI","Konami VRCVII","Nintendo FDS","Nintendo MMC5","Namco 106","Sunsoft FME-07"};
 
 		for(x=0;x<6;x++)
 			if(NSFHeader.SoundChip&(1<<x))
diff --git a/src/state.cpp b/src/state.cpp
index a1df612b..718e3a6d 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -848,7 +848,7 @@ void ResetExState(void (*PreSave)(void), void (*PostSave)(void))
 	for(x=0;x<SFEXINDEX;x++)
 	{
 		if(SFMDATA[x].desc)
-			free(SFMDATA[x].desc);
+			free( (void*)SFMDATA[x].desc);
 	}
 	// adelikat, 3/14/09:  had to add this to clear out the size parameter.  NROM(mapper 0) games were having savestate crashes if loaded after a non NROM game	because the size variable was carrying over and causing savestates to save too much data
 	SFMDATA[0].s = 0;
@@ -858,7 +858,7 @@ void ResetExState(void (*PreSave)(void), void (*PostSave)(void))
 	SFEXINDEX=0;
 }
 
-void AddExState(void *v, uint32 s, int type, char *desc)
+void AddExState(void *v, uint32 s, int type, const char *desc)
 {
 	if(s==~0)
 	{
@@ -885,8 +885,8 @@ void AddExState(void *v, uint32 s, int type, char *desc)
 
 	if(desc)
 	{
-		SFMDATA[SFEXINDEX].desc=(char *)FCEU_malloc(strlen(desc)+1);
-		strcpy(SFMDATA[SFEXINDEX].desc,desc);
+		SFMDATA[SFEXINDEX].desc=(const char *)FCEU_malloc(strlen(desc)+1);
+		strcpy( (char*)SFMDATA[SFEXINDEX].desc,desc);
 	}
 	else
 		SFMDATA[SFEXINDEX].desc=0;
diff --git a/src/state.h b/src/state.h
index a0a2f936..325553fb 100644
--- a/src/state.h
+++ b/src/state.h
@@ -44,11 +44,11 @@ struct SFORMAT
 	uint32 s;
 
 	//a string description of the element
-	char *desc;
+	const char *desc;
 };
 
 void ResetExState(void (*PreSave)(void),void (*PostSave)(void));
-void AddExState(void *v, uint32 s, int type, char *desc);
+void AddExState(void *v, uint32 s, int type, const char *desc);
 
 //indicates that the value is a multibyte integer that needs to be put in the correct byte order
 #define FCEUSTATE_RLSB            0x80000000
diff --git a/src/unif.cpp b/src/unif.cpp
index 8b553a02..44dc9e72 100644
--- a/src/unif.cpp
+++ b/src/unif.cpp
@@ -45,13 +45,13 @@ typedef struct {
 } UNIF_HEADER;
 
 typedef struct {
-	char *name;
+	const char *name;
 	void (*init)(CartInfo *);
 	int flags;
 } BMAPPING;
 
 typedef struct {
-	char *name;
+	const char *name;
 	int (*init)(FCEUFILE *fp);
 } BFMAPPING;
 
@@ -129,7 +129,7 @@ static int DoMirroring(FCEUFILE *fp) {
 			return(0);
 		mirrortodo = t;
 		{
-			static char *stuffo[6] = { "Horizontal", "Vertical", "$2000", "$2400", "\"Four-screen\"", "Controlled by Mapper Hardware" };
+			static const char *stuffo[6] = { "Horizontal", "Vertical", "$2000", "$2400", "\"Four-screen\"", "Controlled by Mapper Hardware" };
 			if (t < 6)
 				FCEU_printf(" Name/Attribute Table Mirroring: %s\n", stuffo[t]);
 		}
@@ -190,7 +190,7 @@ static int DINF(FCEUFILE *fp) {
 	FCEU_printf(" Dumped by: %s\n", name);
 	FCEU_printf(" Dumped with: %s\n", method);
 	{
-		char *months[12] = {
+		const char *months[12] = {
 			"January", "February", "March", "April", "May", "June", "July",
 			"August", "September", "October", "November", "December"
 		};
@@ -232,7 +232,7 @@ static int TVCI(FCEUFILE *fp) {
 	if ((t = FCEU_fgetc(fp)) == EOF)
 		return(0);
 	if (t <= 2) {
-		char *stuffo[3] = { "NTSC", "PAL", "NTSC and PAL" };
+		const char *stuffo[3] = { "NTSC", "PAL", "NTSC and PAL" };
 		if (t == 0) {
 			GameInfo->vidsys = GIV_NTSC;
 			FCEUI_SetVidSystem(0);
diff --git a/src/utils/xstring.cpp b/src/utils/xstring.cpp
index 831aebd9..8f8b66d3 100644
--- a/src/utils/xstring.cpp
+++ b/src/utils/xstring.cpp
@@ -157,7 +157,7 @@ int chr_replace(char *str, char search, char replace) {
 
 ///Replaces all instances of 'search' with 'replace'
 ///Returns number of sub-strings modified, or -1 on error
-int str_replace(char *str, char *search, char *replace) {
+int str_replace(char *str, const char *search, const char *replace) {
 	unsigned int i=0,j=0; //mbg merge 7/17/06 changed to unsigned int
 	int searchlen,replacelen;
 	char *astr;
diff --git a/src/utils/xstring.h b/src/utils/xstring.h
index b42aec12..9d860486 100644
--- a/src/utils/xstring.h
+++ b/src/utils/xstring.h
@@ -43,7 +43,7 @@ int str_ltrim(char *str, int flags);
 int str_rtrim(char *str, int flags);
 int str_strip(char *str, int flags);
 int chr_replace(char *str, char search, char replace);
-int str_replace(char *str, char *search, char *replace);
+int str_replace(char *str, const char *search, const char *replace);
 
 int HexStringToBytesLength(const std::string& str);
 int Base64StringToBytesLength(const std::string& str);
@@ -129,4 +129,4 @@ std::string wcstombs(std::wstring str);
 std::string getExtension(const char* input);
 
 std::string StripExtension(std::string filename);
-std::string StripPath(std::string filename);
\ No newline at end of file
+std::string StripPath(std::string filename);
diff --git a/src/video.cpp b/src/video.cpp
index d9654c96..3c43d7bd 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -398,7 +398,7 @@ void snapAVI()
 		FCEUI_AviVideoUpdate(XBuf);
 }
 
-void FCEU_DispMessageOnMovie(char *format, ...)
+void FCEU_DispMessageOnMovie(const char *format, ...)
 {
 	va_list ap;
 
@@ -414,7 +414,7 @@ void FCEU_DispMessageOnMovie(char *format, ...)
 		guiMessage.howlong = 0;
 }
 
-void FCEU_DispMessage(char *format, int disppos=0, ...)
+void FCEU_DispMessage(const char *format, int disppos=0, ...)
 {
 	va_list ap;
 
@@ -455,7 +455,7 @@ void FCEU_ResetMessages()
 }
 
 
-static int WritePNGChunk(FILE *fp, uint32 size, char *type, uint8 *data)
+static int WritePNGChunk(FILE *fp, uint32 size, const char *type, uint8 *data)
 {
 	uint32 crc;
 
diff --git a/src/vsuni.cpp b/src/vsuni.cpp
index 26e6ab62..c2e64766 100644
--- a/src/vsuni.cpp
+++ b/src/vsuni.cpp
@@ -35,7 +35,7 @@
 
 #define IOPTION_PREDIP    0x10
 typedef struct {
-	char *name;
+	const char *name;
 	uint64 md5partial;
 	int mapper;
 	int mirroring;