From fe77ebd2eba9c95a804d933db862a36d2a189f39 Mon Sep 17 00:00:00 2001 From: Daniel Scharrer Date: Sun, 24 Jun 2012 07:14:41 +0200 Subject: [PATCH] Consistently prefix warning messages --- src/cli/main.cpp | 6 +++--- src/util/log.cpp | 2 +- src/util/storedenum.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cli/main.cpp b/src/cli/main.cpp index e303311..02e94e3 100644 --- a/src/cli/main.cpp +++ b/src/cli/main.cpp @@ -346,9 +346,9 @@ static void process_file(const fs::path & file, const options & o) { } if(checksum != file.checksum) { - log_warning << "checksum mismatch:"; - log_warning << "actual: " << checksum; - log_warning << "expected: " << file.checksum; + log_warning << "checksum mismatch:\n" + << "actual: " << checksum << '\n' + << "expected: " << file.checksum; if(o.test) { throw new std::runtime_error("integrity test failed"); } diff --git a/src/util/log.cpp b/src/util/log.cpp index ffa3016..74e78ce 100644 --- a/src/util/log.cpp +++ b/src/util/log.cpp @@ -38,7 +38,7 @@ logger::~logger() { case Debug: std::cout << color::cyan << buffer.str() << std::endl; break; case Info: std::cout << color::white << buffer.str() << std::endl; break; case Warning: { - std::cerr << color::yellow << buffer.str() << std::endl; + std::cerr << color::yellow << "warning: " << buffer.str() << std::endl; total_warnings++; break; } diff --git a/src/util/storedenum.hpp b/src/util/storedenum.hpp index 34f2971..a9b3bcf 100644 --- a/src/util/storedenum.hpp +++ b/src/util/storedenum.hpp @@ -77,7 +77,7 @@ public: return Mapping::values[value]; } - log_warning << "warning: unexpected " << enum_names::name << " value: " << value; + log_warning << "unexpected " << enum_names::name << " value: " << value; return Mapping::default_value; }