From ceeb2810fe831fba7ad93d0b99dc4ed10a67ad9d Mon Sep 17 00:00:00 2001 From: Daniel Lim Wee Soong Date: Tue, 20 Mar 2018 14:15:48 +0800 Subject: [PATCH] Add nullptr check to LogEntry Also remove explicit comparison with nullptr to make code shorter. --- src/common/logging/backend.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 0400a3282..fdd0480c9 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -140,7 +140,7 @@ void SetFilter(Filter* new_filter) { void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, const char* format, ...) { - if (filter != nullptr && !filter->CheckMessage(log_class, log_level)) + if (filter && !filter->CheckMessage(log_class, log_level)) return; std::array formatting_buffer; va_list args; @@ -154,7 +154,7 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned } void LogEntry(Entry& entry) { - if (!filter->CheckMessage(entry.log_class, entry.log_level)) + if (filter && !filter->CheckMessage(entry.log_class, entry.log_level)) return; PrintColoredMessage(entry);