citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #1018 from bbarenblat/master 

Handle invalid `Log::Level::Count`
This commit is contained in:
bunnei 2015-08-05 11:59:06 -04:00
parent bd6131bdc0 0298b7bedd
commit b6c241d667
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/logging/backend.cpp
View File

@ -6,6 +6,7 @@
#include <array> #include <array>
#include <cstdio> #include <cstdio>
#include "common/assert.h"
#include "common/common_funcs.h" // snprintf compatibility define #include "common/common_funcs.h" // snprintf compatibility define
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "common/logging/filter.h" #include "common/logging/filter.h"
@ -78,8 +79,9 @@ const char* GetLevelName(Level log_level) {
LVL(Warning); LVL(Warning);
LVL(Error); LVL(Error);
LVL(Critical); LVL(Critical);
case Level::Count:
UNREACHABLE();
} }
return "Unknown";
#undef LVL #undef LVL
} }

5
src/common/logging/text_formatter.cpp
View File

@ -14,6 +14,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/logging/text_formatter.h" #include "common/logging/text_formatter.h"
#include "common/assert.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/string_util.h" #include "common/string_util.h"
@ -82,6 +83,8 @@ void PrintColoredMessage(const Entry& entry) {
color = FOREGROUND_RED | FOREGROUND_INTENSITY; break; color = FOREGROUND_RED | FOREGROUND_INTENSITY; break;
case Level::Critical: // Bright magenta case Level::Critical: // Bright magenta
color = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY; break; color = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY; break;
case Level::Count:
UNREACHABLE();
} }
SetConsoleTextAttribute(console_handle, color); SetConsoleTextAttribute(console_handle, color);
@ -101,6 +104,8 @@ void PrintColoredMessage(const Entry& entry) {
color = ESC "[1;31m"; break; color = ESC "[1;31m"; break;
case Level::Critical: // Bright magenta case Level::Critical: // Bright magenta
color = ESC "[1;35m"; break; color = ESC "[1;35m"; break;
case Level::Count:
UNREACHABLE();
} }
fputs(color, stderr); fputs(color, stderr);