X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..cd621fe499141885e5a0d8b4e42a0f8a7f41a9ac:/lib/base/eerror.cpp diff --git a/lib/base/eerror.cpp b/lib/base/eerror.cpp index 0871bb71..11bb9943 100644 --- a/lib/base/eerror.cpp +++ b/lib/base/eerror.cpp @@ -4,11 +4,13 @@ #include #include -#include +#include + +// #include int infatal=0; -Signal2 logOutput; +Signal2 logOutput; int logOutputConsole=1; void eFatal(const char* fmt, ...) @@ -20,6 +22,7 @@ void eFatal(const char* fmt, ...) va_end(ap); logOutput(lvlFatal, buf); fprintf(stderr, "%s\n",buf ); +#if 0 if (!infatal) { infatal=1; @@ -27,6 +30,8 @@ void eFatal(const char* fmt, ...) msg.show(); msg.exec(); } +#endif + _exit(0); } @@ -38,7 +43,7 @@ void eDebug(const char* fmt, ...) va_start(ap, fmt); vsnprintf(buf, 1024, fmt, ap); va_end(ap); - logOutput(lvlDebug, eString(buf) + "\n"); + logOutput(lvlDebug, std::string(buf) + "\n"); if (logOutputConsole) fprintf(stderr, "%s\n", buf); } @@ -62,7 +67,7 @@ void eWarning(const char* fmt, ...) va_start(ap, fmt); vsnprintf(buf, 1024, fmt, ap); va_end(ap); - logOutput(lvlWarning, eString(buf) + "\n"); + logOutput(lvlWarning, std::string(buf) + "\n"); if (logOutputConsole) fprintf(stderr, "%s\n", buf); }