From 487ddeee3120cd7db152dd8c9fcda715a464acd5 Mon Sep 17 00:00:00 2001 From: Cekis Date: Mon, 7 Feb 2022 15:53:11 -0500 Subject: [PATCH] Backed out bad commit and added cleaner logging to mIFF. --- engine/client/application/Miff/src/linux/miff.cpp | 2 +- engine/client/application/Miff/src/linux/parser.lex | 6 ++++-- engine/shared/library/sharedFoundation/src/shared/Misc.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/engine/client/application/Miff/src/linux/miff.cpp b/engine/client/application/Miff/src/linux/miff.cpp index 6927490e..454f3e32 100755 --- a/engine/client/application/Miff/src/linux/miff.cpp +++ b/engine/client/application/Miff/src/linux/miff.cpp @@ -275,7 +275,7 @@ static void callbackFunction(void) { if (!outfileHandler->writeBuffer()) { - fprintf(stderr, "MIFF: failed to write output file \"%s\"\n", local_outFileName); + fprintf(stderr, "FAILURE: failed to write output file \"%s\"\n", local_outFileName); local_errorFlag = ERR_WRITEERROR; } } diff --git a/engine/client/application/Miff/src/linux/parser.lex b/engine/client/application/Miff/src/linux/parser.lex index f80c2c9b..44b9af40 100644 --- a/engine/client/application/Miff/src/linux/parser.lex +++ b/engine/client/application/Miff/src/linux/parser.lex @@ -326,8 +326,10 @@ EXP (e|E)(\+|-)? /* do a count on bracket matching... */ if (0 == count_brace()) { - if (!initialCompile && !globalErrorFlag) - MIFFMessage("mIFF successfully compiled!\n", 0); + if (!initialCompile && !globalErrorFlag) { + sprintf(myString, "mIFF (SUCCESS): compiled \"%s\"\n", inFileName); + MIFFMessage(myString, 0); + } } yyterminate(); /* tell yyparse() it's time to quit! DO NOT comment or delete this line! */ diff --git a/engine/shared/library/sharedFoundation/src/shared/Misc.h b/engine/shared/library/sharedFoundation/src/shared/Misc.h index d8a02adb..d0e70c94 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Misc.h +++ b/engine/shared/library/sharedFoundation/src/shared/Misc.h @@ -230,7 +230,7 @@ inline void *memmove(void *destination, const void *source, int length) { DEBUG_FATAL(!destination, ("nullptr destination arg")); DEBUG_FATAL(!source, ("nullptr source arg")); - return memmove(destination, source, length); + return memmove(destination, source, static_cast(length)); } // ----------------------------------------------------------------------