shithub: choc

Info  •  Files  •  Log  •  Branches

Fix warnings introduced by previous commits.

--- a/src/d_iwad.c

+++ b/src/d_iwad.c

@@ -525,7 +525,7 @@

 // 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;

--- a/src/i_sdlmusic.c

+++ b/src/i_sdlmusic.c

@@ -497,7 +497,6 @@

 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 boolean WriteWrapperTimidityConfig(char *write_path)

 {

-    char *p, *path;

+    char *path;

     FILE *fstream;

     if (!strcmp(timidity_cfg_path, ""))

--- a/src/m_argv.c

+++ b/src/m_argv.c

@@ -243,7 +243,7 @@

 // 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]);

 }

--- a/src/m_argv.h

+++ b/src/m_argv.h

@@ -44,6 +44,6 @@

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

-char *M_GetExecutableName(void);

+const char *M_GetExecutableName(void);

 #endif

--- a/src/setup/mode.c

+++ b/src/setup/mode.c

@@ -245,7 +245,7 @@

 static boolean CheckExecutableName(GameSelectCallback callback)

 {

     mission_config_t *config;

-    char *exe_name;

+    const char *exe_name;

     int i;

     exe_name = M_GetExecutableName();