commit 3e0dc2d65cc5d31dc5ef1348af1681b032ab0a80
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Sep 9 18:54:20 2018 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Sep 9 18:54:20 2018 -0400

    Fix warnings introduced by previous commits.
---
 src/d_iwad.c     | 2 +-
 src/i_sdlmusic.c | 3 +--
 src/m_argv.c     | 2 +-
 src/m_argv.h     | 2 +-
 src/setup/mode.c | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/d_iwad.c b/src/d_iwad.c
index 5e87ebc7..a7aa6d2b 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -525,7 +525,7 @@ static char *SearchDirectoryForIWAD(const char *dir, int mask, GameMission_t *mi
 // When given an IWAD with the '-iwad' parameter,
 // attempt to identify it by its name.

-static GameMission_t IdentifyIWADByName(char *name, int mask)
+static GameMission_t IdentifyIWADByName(const char *name, int mask)
 {
     size_t i;
     GameMission_t mission;
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index f400bd7a..2244cf42 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -497,7 +497,6 @@ static int ParseHexDigit(char c)
 static char *GetFullPath(char *base_filename, char *path)
 {
     char *basedir, *result;
-    char *p;

     // Starting with directory separator means we have an absolute path,
     // so just return it.
@@ -805,7 +804,7 @@ static void DumpSubstituteConfig(char *filename)

 static boolean WriteWrapperTimidityConfig(char *write_path)
 {
-    char *p, *path;
+    char *path;
     FILE *fstream;

     if (!strcmp(timidity_cfg_path, ""))
diff --git a/src/m_argv.c b/src/m_argv.c
index f22cd8c6..2b989c8e 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -243,7 +243,7 @@ void M_FindResponseFile(void)

 // Return the name of the executable used to start the program:

-char *M_GetExecutableName(void)
+const char *M_GetExecutableName(void)
 {
     return M_BaseName(myargv[0]);
 }
diff --git a/src/m_argv.h b/src/m_argv.h
index c718b685..6c364ec9 100644
--- a/src/m_argv.h
+++ b/src/m_argv.h
@@ -44,6 +44,6 @@ boolean M_ParmExists(const char *check);

 // Get name of executable used to run this program:

-char *M_GetExecutableName(void);
+const char *M_GetExecutableName(void);

 #endif
diff --git a/src/setup/mode.c b/src/setup/mode.c
index 71d9e12c..15841530 100644
--- a/src/setup/mode.c
+++ b/src/setup/mode.c
@@ -245,7 +245,7 @@ static mission_config_t *GetMissionForName(char *name)
 static boolean CheckExecutableName(GameSelectCallback callback)
 {
     mission_config_t *config;
-    char *exe_name;
+    const char *exe_name;
     int i;

     exe_name = M_GetExecutableName();