fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-08-11 00:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error handling in print_colored

Browse Source
This commit is contained in:
Victor Zverovich
2015-02-08 20:06:45 -08:00
parent 7004d1edf6
commit 9368b6a4ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
format.cc
View File

@@ -1114,17 +1114,17 @@ FMT_FUNC void fmt::print_colored(Color c, StringRef format, ArgList args) {
#ifdef _WIN32 #ifdef _WIN32
HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE);
if (handle == INVALID_HANDLE_VALUE) if (handle == INVALID_HANDLE_VALUE)
FMT_THROW(GetLastError(), "cannot get output handle"); FMT_THROW(WindowsError(GetLastError(), "cannot get output handle"));
CONSOLE_SCREEN_BUFFER_INFO info_con; CONSOLE_SCREEN_BUFFER_INFO info_con;
if (!GetConsoleScreenBufferInfo(handle, &info_con)) if (!GetConsoleScreenBufferInfo(handle, &info_con))
FMT_THROW(GetLastError(), "cannot get console information"); FMT_THROW(WindowsError(GetLastError(), "cannot get console information"));
WORD reset_color = info_con.wAttributes; WORD reset_color = info_con.wAttributes;
WORD color = static_cast<int>(c) >= ARRAYSIZE(WIN32_COLORS) ? reset_color : WIN32_COLORS[c]; WORD color = static_cast<int>(c) >= ARRAYSIZE(WIN32_COLORS) ? reset_color : WIN32_COLORS[c];
if (!SetConsoleTextAttribute(handle, color)) if (!SetConsoleTextAttribute(handle, color))
FMT_THROW(GetLastError(), "cannot set console color"); FMT_THROW(WindowsError(GetLastError(), "cannot set console color"));
print(format, args); print(format, args);
if (!SetConsoleTextAttribute(handle, reset_color)) if (!SetConsoleTextAttribute(handle, reset_color))
FMT_THROW(GetLastError(), "cannot set console color"); FMT_THROW(WindowsError(GetLastError(), "cannot set console color"));
#else #else
char escape[] = "\x1b[30m"; char escape[] = "\x1b[30m";
escape[3] = '0' + static_cast<char>(c); escape[3] = '0' + static_cast<char>(c);