From db8ef4d0ef54cf967ac04fe5aef7a657a58afe8b Mon Sep 17 00:00:00 2001 From: sezero Date: Fri, 24 Aug 2018 21:03:55 +0300 Subject: [PATCH] cvg,sst1, init: shortened a few messages. --- glide2x/cvg/init/parse.c | 12 ++++++------ glide2x/cvg/init/sst1init.c | 1 - glide2x/sst1/init/initvg/parse.c | 8 ++++---- glide2x/sst1/init/initvg/sst1init.c | 1 - glide3x/cvg/init/parse.c | 12 ++++++------ glide3x/cvg/init/sst1init.c | 1 - glide3x/sst1/init/initvg/parse.c | 8 ++++---- glide3x/sst1/init/initvg/sst1init.c | 1 - 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/glide2x/cvg/init/parse.c b/glide2x/cvg/init/parse.c index bba69e6..df3e917 100644 --- a/glide2x/cvg/init/parse.c +++ b/glide2x/cvg/init/parse.c @@ -247,23 +247,23 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() if(inCfg) { if(!sst1InitParseFieldCfg(buffer)) { - if(helper) INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [CFG] section of .ini file...\n")); + if(helper) INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[CFG]")); retVal = FXFALSE; break; } } else if(inDac) { if(!sst1InitParseFieldDac(buffer)) { - if(helper) INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [DAC] section of .ini file...\n")); + if(helper) INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[DAC]")); retVal = FXFALSE; break; } } } - if (file != NULL) fclose(file); - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + fclose(file); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); __errExit: - checkedFileP = FXTRUE; + checkedFileP = FXTRUE; #endif /* !DIRECTX */ return retVal; @@ -336,7 +336,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() { break; } } - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); __errExit: if (file) fclose(file); diff --git a/glide2x/cvg/init/sst1init.c b/glide2x/cvg/init/sst1init.c index 8b8e59b..9c0cd74 100644 --- a/glide2x/cvg/init/sst1init.c +++ b/glide2x/cvg/init/sst1init.c @@ -245,7 +245,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber, } if( clearBoardInfo ) { - INIT_PRINTF(("sst1Init Routines")); INIT_PRINTF(("sst1InitMapBoard(): BoardsInSystem = %d\n", boardsInSystem)); diff --git a/glide2x/sst1/init/initvg/parse.c b/glide2x/sst1/init/initvg/parse.c index 443b5c0..ccc8790 100644 --- a/glide2x/sst1/init/initvg/parse.c +++ b/glide2x/sst1/init/initvg/parse.c @@ -135,19 +135,19 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() if(inCfg) { if(!sst1InitParseFieldCfg(buffer)) { if(helper) - INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [CFG] section of .ini file...\n")); + INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[CFG]")); return(FXFALSE); } } else if(inDac) { if(!sst1InitParseFieldDac(buffer)) { if(helper) - INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [DAC] section of .ini file...\n")); + INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[DAC]")); return(FXFALSE); } } } fclose(file); - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); return(FXTRUE); #endif @@ -217,7 +217,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() { break; } } - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); __errExit: if (file) fclose(file); diff --git a/glide2x/sst1/init/initvg/sst1init.c b/glide2x/sst1/init/initvg/sst1init.c index 73823bb..c0fd82c 100644 --- a/glide2x/sst1/init/initvg/sst1init.c +++ b/glide2x/sst1/init/initvg/sst1init.c @@ -164,7 +164,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoard(FxU32 BoardNumber) } if(BoardNumber == 0) { - INIT_PRINTF(("sst1Init Routines")); INIT_PRINTF(("sst1InitMapBoard(): BoardsInSystem = %d\n", boardsInSystem)); diff --git a/glide3x/cvg/init/parse.c b/glide3x/cvg/init/parse.c index bba69e6..df3e917 100644 --- a/glide3x/cvg/init/parse.c +++ b/glide3x/cvg/init/parse.c @@ -247,23 +247,23 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() if(inCfg) { if(!sst1InitParseFieldCfg(buffer)) { - if(helper) INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [CFG] section of .ini file...\n")); + if(helper) INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[CFG]")); retVal = FXFALSE; break; } } else if(inDac) { if(!sst1InitParseFieldDac(buffer)) { - if(helper) INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [DAC] section of .ini file...\n")); + if(helper) INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[DAC]")); retVal = FXFALSE; break; } } } - if (file != NULL) fclose(file); - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + fclose(file); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); __errExit: - checkedFileP = FXTRUE; + checkedFileP = FXTRUE; #endif /* !DIRECTX */ return retVal; @@ -336,7 +336,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() { break; } } - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); __errExit: if (file) fclose(file); diff --git a/glide3x/cvg/init/sst1init.c b/glide3x/cvg/init/sst1init.c index 32a06b2..8d2b781 100644 --- a/glide3x/cvg/init/sst1init.c +++ b/glide3x/cvg/init/sst1init.c @@ -245,7 +245,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber, } if( clearBoardInfo ) { - INIT_PRINTF(("sst1Init Routines")); INIT_PRINTF(("sst1InitMapBoard(): BoardsInSystem = %d\n", boardsInSystem)); diff --git a/glide3x/sst1/init/initvg/parse.c b/glide3x/sst1/init/initvg/parse.c index 443b5c0..ccc8790 100644 --- a/glide3x/sst1/init/initvg/parse.c +++ b/glide3x/sst1/init/initvg/parse.c @@ -135,19 +135,19 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() if(inCfg) { if(!sst1InitParseFieldCfg(buffer)) { if(helper) - INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [CFG] section of .ini file...\n")); + INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[CFG]")); return(FXFALSE); } } else if(inDac) { if(!sst1InitParseFieldDac(buffer)) { if(helper) - INIT_PRINTF(("sst1InitVoodooFile(): ERROR in [DAC] section of .ini file...\n")); + INIT_PRINTF(("ERROR in %s section of .ini file...\n", "[DAC]")); return(FXFALSE); } } } fclose(file); - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); return(FXTRUE); #endif @@ -217,7 +217,7 @@ FX_ENTRY FxBool FX_CALL sst1InitVoodooFile() { break; } } - INIT_PRINTF(("sst1Init Routines(): Using Initialization file '%s'\n", filename)); + INIT_PRINTF(("INIT: Using .ini file '%s'\n", filename)); __errExit: if (file) fclose(file); diff --git a/glide3x/sst1/init/initvg/sst1init.c b/glide3x/sst1/init/initvg/sst1init.c index d535a4f..032ba3d 100644 --- a/glide3x/sst1/init/initvg/sst1init.c +++ b/glide3x/sst1/init/initvg/sst1init.c @@ -164,7 +164,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoard(FxU32 BoardNumber) } if(BoardNumber == 0) { - INIT_PRINTF(("sst1Init Routines")); INIT_PRINTF(("sst1InitMapBoard(): BoardsInSystem = %d\n", boardsInSystem));