Part two of more const casting, this time affecting argv instances.

git-svn-id: https://svn.eduke32.com/eduke32@5552 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-01-12 10:30:56 +00:00
parent 98ebda94ec
commit 344e10628f
14 changed files with 20 additions and 21 deletions

View file

@ -12,7 +12,7 @@
extern "C" { extern "C" {
#endif #endif
extern int32_t app_main(int32_t argc, const char **argv); extern int32_t app_main(int32_t argc, char const * const * argv);
extern const char* AppProperName; extern const char* AppProperName;
extern const char* AppTechnicalName; extern const char* AppTechnicalName;

View file

@ -88,7 +88,7 @@ static inline void realloc_copy(char **fn, const char *buf)
int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens); int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens);
int32_t G_CheckCmdSwitch(int32_t argc, const char **argv, const char *str); int32_t G_CheckCmdSwitch(int32_t argc, char const * const * argv, const char *str);
int32_t testkopen(const char *filename, char searchfirst); // full-blown kopen4load int32_t testkopen(const char *filename, char searchfirst); // full-blown kopen4load
int32_t check_file_exist(const char *fn); // findfrompath with pathsearchmode=1 / search in zips int32_t check_file_exist(const char *fn); // findfrompath with pathsearchmode=1 / search in zips

View file

@ -190,7 +190,7 @@ extern void clearkeys(void);
extern const char *ExtGetVer(void); extern const char *ExtGetVer(void);
extern int32_t ExtInit(void); extern int32_t ExtInit(void);
extern int32_t ExtPreInit(int32_t argc,const char **argv); extern int32_t ExtPreInit(int32_t argc,char const * const * argv);
extern int32_t ExtPostStartupWindow(void); extern int32_t ExtPostStartupWindow(void);
extern void ExtPostInit(void); extern void ExtPostInit(void);
extern void ExtUnInit(void); extern void ExtUnInit(void);

View file

@ -34,7 +34,7 @@ static char kensig[64];
static const char *CallExtGetVer(void); static const char *CallExtGetVer(void);
static int32_t CallExtInit(void); static int32_t CallExtInit(void);
static int32_t CallExtPreInit(int32_t argc,const char **argv); static int32_t CallExtPreInit(int32_t argc,char const * const * argv);
static int32_t CallExtPostStartupWindow(void); static int32_t CallExtPostStartupWindow(void);
static void CallExtPostInit(void); static void CallExtPostInit(void);
static void CallExtUnInit(void); static void CallExtUnInit(void);
@ -567,7 +567,7 @@ static void M32_FatalEngineError(void)
exit(2); exit(2);
} }
int32_t app_main(int32_t argc, const char **argv) int32_t app_main(int32_t argc, char const * const * argv)
{ {
#ifdef STARTUP_SETUP_WINDOW #ifdef STARTUP_SETUP_WINDOW
char cmdsetup = 0; char cmdsetup = 0;
@ -11026,7 +11026,7 @@ static int32_t CallExtInit(void)
{ {
return ExtInit(); return ExtInit();
} }
static int32_t CallExtPreInit(int32_t argc,const char **argv) static int32_t CallExtPreInit(int32_t argc,char const * const * argv)
{ {
return ExtPreInit(argc, argv); return ExtPreInit(argc, argv);
} }

View file

@ -88,7 +88,7 @@ int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens)
////////// //////////
int32_t G_CheckCmdSwitch(int32_t argc, const char **argv, const char *str) int32_t G_CheckCmdSwitch(int32_t argc, char const * const * argv, const char *str)
{ {
int32_t i; int32_t i;
for (i=0; i<argc; i++) for (i=0; i<argc; i++)

View file

@ -437,7 +437,7 @@ int32_t main(int32_t argc, char *argv[])
r = app_main(buildargc, (const char **)buildargv); r = app_main(buildargc, (const char **)buildargv);
#else #else
r = app_main(argc, (const char **)argv); r = app_main(argc, (char const * const *)argv);
#endif #endif
startwin_close(); startwin_close();

View file

@ -8002,7 +8002,7 @@ extern char forcegl;
const char **g_argv; const char **g_argv;
#endif #endif
static void G_CheckCommandLine(int32_t argc, const char **argv) static void G_CheckCommandLine(int32_t argc, char const * const * argv)
{ {
int32_t i = 1, j, maxlen=0, *lengths; int32_t i = 1, j, maxlen=0, *lengths;
const char *c, *k; const char *c, *k;
@ -8388,7 +8388,7 @@ static int32_t check_filename_casing(void)
} }
#endif #endif
int32_t ExtPreInit(int32_t argc,const char **argv) int32_t ExtPreInit(int32_t argc,char const * const * argv)
{ {
#if defined(_WIN32) && defined(DEBUGGINGAIDS) #if defined(_WIN32) && defined(DEBUGGINGAIDS)
{ {

View file

@ -254,7 +254,7 @@ int32_t usecwd;
static void G_LoadAddon(void); static void G_LoadAddon(void);
int32_t g_groupFileHandle; int32_t g_groupFileHandle;
void G_ExtPreInit(int32_t argc,const char **argv) void G_ExtPreInit(int32_t argc,char const * const * argv)
{ {
usecwd = G_CheckCmdSwitch(argc, argv, "-usecwd"); usecwd = G_CheckCmdSwitch(argc, argv, "-usecwd");

View file

@ -109,7 +109,7 @@ extern int32_t kopen4loadfrommod(const char *filename, char searchfirst);
extern void G_AddSearchPaths(void); extern void G_AddSearchPaths(void);
extern void G_CleanupSearchPaths(void); extern void G_CleanupSearchPaths(void);
extern void G_ExtPreInit(int32_t argc,const char **argv); extern void G_ExtPreInit(int32_t argc,char const * const * argv);
extern void G_ExtInit(void); extern void G_ExtInit(void);
extern void G_ScanGroups(void); extern void G_ScanGroups(void);
extern void G_LoadGroups(int32_t autoload); extern void G_LoadGroups(int32_t autoload);

View file

@ -9918,7 +9918,7 @@ static void G_AddDemo(const char* param)
} }
} }
static void G_CheckCommandLine(int32_t argc, const char **argv) static void G_CheckCommandLine(int32_t argc, char const * const * argv)
{ {
int16_t i = 1, j; int16_t i = 1, j;
const char *c, *k; const char *c, *k;
@ -11451,7 +11451,7 @@ void G_MaybeAllocPlayer(int32_t pnum)
EDUKE32_STATIC_ASSERT(sizeof(actor_t)==128); EDUKE32_STATIC_ASSERT(sizeof(actor_t)==128);
EDUKE32_STATIC_ASSERT(sizeof(DukePlayer_t)%4 == 0); EDUKE32_STATIC_ASSERT(sizeof(DukePlayer_t)%4 == 0);
int32_t app_main(int32_t argc, const char **argv) int32_t app_main(int32_t argc, char const * const * argv)
{ {
int32_t i = 0, j; int32_t i = 0, j;

View file

@ -400,7 +400,6 @@ extern vec2_t G_ScreenTextShadow(int32_t sx, int32_t sy, const int32_t font, int
// 2048+(32+16)+8+4 // 2048+(32+16)+8+4
#define SPAWN_PROTECT_CSTAT_MASK (CSTAT_SPRITE_NOSHADE|CSTAT_SPRITE_SLAB|CSTAT_SPRITE_XFLIP|CSTAT_SPRITE_YFLIP); #define SPAWN_PROTECT_CSTAT_MASK (CSTAT_SPRITE_NOSHADE|CSTAT_SPRITE_SLAB|CSTAT_SPRITE_XFLIP|CSTAT_SPRITE_YFLIP);
int32_t app_main(int32_t argc,const char **argv);
void fadepal(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step); void fadepal(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step);
//void fadepaltile(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step,int32_t tile); //void fadepaltile(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step,int32_t tile);
void G_InitTimer(int32_t ticpersec); void G_InitTimer(int32_t ticpersec);

View file

@ -906,7 +906,7 @@ static void SW_FatalEngineError(void)
} }
void void
InitGame(int32_t argc, const char **argv) InitGame(int32_t argc, char const * const * argv)
{ {
extern int MovesPerPacket; extern int MovesPerPacket;
//void *ReserveMem=NULL; //void *ReserveMem=NULL;
@ -2879,7 +2879,7 @@ GameIntro(void)
} }
void void
Control(int32_t argc, const char **argv) Control(int32_t argc, char const * const * argv)
{ {
InitGame(argc, argv); InitGame(argc, argv);
@ -3371,7 +3371,7 @@ int DetectShareware(void)
} }
void CommandLineHelp(const char **argv) void CommandLineHelp(char const * const * argv)
{ {
int i; int i;
#ifdef RENDERTYPEWIN #ifdef RENDERTYPEWIN
@ -3418,7 +3418,7 @@ void CommandLineHelp(const char **argv)
#endif #endif
} }
int32_t app_main(int32_t argc, const char **argv) int32_t app_main(int32_t argc, char const * const * argv)
{ {
int i; int i;
int stat, nexti; int stat, nexti;

View file

@ -86,7 +86,7 @@ const char *ExtGetVer(void)
return s_buildRev; return s_buildRev;
} }
int32_t ExtPreInit(int32_t argc,const char **argv) int32_t ExtPreInit(int32_t argc,char const * const * argv)
{ {
UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argc);
UNREFERENCED_PARAMETER(argv); UNREFERENCED_PARAMETER(argv);

View file

@ -449,7 +449,7 @@ static void Ken_FatalEngineError(void)
buildprintf("There was a problem initialising the engine: %s.\n", engineerrstr); buildprintf("There was a problem initialising the engine: %s.\n", engineerrstr);
} }
int32_t app_main(int32_t argc, const char **argv) int32_t app_main(int32_t argc, char const * const * argv)
{ {
#if defined STARTUP_SETUP_WINDOW #if defined STARTUP_SETUP_WINDOW
int cmdsetup = 0; int cmdsetup = 0;