Apple-2-Tools/ciderpress
1
0
Fork 0
mirror of https://github.com/fadden/ciderpress.git synced 2026-04-21 17:17:02 +00:00
Code Issues Projects Releases Wiki Activity

Added new logging macros

Browse Source 
Visual Studio figured out variadic macros around 2005, so we can
finally replace the explicit-arg-count debug log macros.

Also, fixed some include guards.

Also, bumped version to 4.0.0d1.
This commit is contained in:
Andy McFadden
2014-11-17 17:54:34 -08:00
parent 7da3dc0efe
commit d21ba553ab
23 changed files with 255 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mdc/Main.cpp
+5 -25
View File
@@ -176,15 +176,9 @@ MainWindow::DebugMsgHandler(const char* file, int line, const char* msg)
ASSERT(file != nil);
ASSERT(msg != nil);
#if defined(_DEBUG_LOG)
//fprintf(gLog, "%s(%d) : %s", file, line, msg);
fprintf(gLog, "%05u %hs", gPid, msg);
#elif defined(_DEBUG)
_CrtDbgReport(_CRT_WARN, file, line, NULL, "%hs", msg);
#else
/* do nothing */
#endif
LOG_BASE(DebugLog::LOG_INFO, file, line, "<diskimg> %hs", msg);
}
/*
* Handle a global error message from the NufxLib library.
*/
@@ -193,23 +187,9 @@ MainWindow::NufxErrorMsgHandler(NuArchive* /*pArchive*/, void* vErrorMessage)
{
const NuErrorMessage* pErrorMessage = (const NuErrorMessage*) vErrorMessage;
#if defined(_DEBUG_LOG)
if (pErrorMessage->isDebug) {
fprintf(gLog, "%05u <nufxlib> [D] %hs\n", gPid, pErrorMessage->message);
} else {
fprintf(gLog, "%05u <nufxlib> %hs\n", gPid, pErrorMessage->message);
}
#elif defined(_DEBUG)
if (pErrorMessage->isDebug) {
_CrtDbgReport(_CRT_WARN, pErrorMessage->file, pErrorMessage->line,
NULL, "<nufxlib> [D] %hs\n", pErrorMessage->message);
} else {
_CrtDbgReport(_CRT_WARN, pErrorMessage->file, pErrorMessage->line,
NULL, "<nufxlib> %hs\n", pErrorMessage->message);
}
#else
/* do nothing */
#endif
LOG_BASE(pErrorMessage->isDebug ? DebugLog::LOG_DEBUG : DebugLog::LOG_WARNING,
pErrorMessage->file, pErrorMessage->line, "<nufxlib> %hs\n",
pErrorMessage->message);
return kNuOK;
}