summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-04-14 00:20:06 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-04-15 00:04:54 +0300
commit93be96431a5cdacfe632c3cfb6763b90649bc590 (patch)
treeb6e43ee7c26142972bdc9ff25884e09697436c2f /include
parent304ea65551b410a82b81dfd83e25b089ce158954 (diff)
libcamera: log: De-duplicate _log() functions and LogMessage constructor
The _log() functions, as well as the LogMessage constructor, exist in two versions, one that takes a log category, and one that doesn't. The latter uses the default log category. This can be simplified by passing a LogCategory pointer to _log(), which can then be null for the default category, and moving the retrieval of the default log category from the LogMessage constructor to the _log() function. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Sebastian Fricke <sebastian.fricke@posteo.net> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/internal/log.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h
index e76ae913..0fdacc47 100644
--- a/include/libcamera/internal/log.h
+++ b/include/libcamera/internal/log.h
@@ -56,8 +56,6 @@ class LogMessage
{
public:
LogMessage(const char *fileName, unsigned int line,
- LogSeverity severity);
- LogMessage(const char *fileName, unsigned int line,
const LogCategory &category, LogSeverity severity);
LogMessage(LogMessage &&);
@@ -92,23 +90,20 @@ protected:
virtual std::string logPrefix() const = 0;
LogMessage _log(const char *file, unsigned int line,
- LogSeverity severity) const;
- LogMessage _log(const char *file, unsigned int line,
- const LogCategory &category,
+ const LogCategory *category,
LogSeverity severity) const;
};
-LogMessage _log(const char *file, unsigned int line, LogSeverity severity);
LogMessage _log(const char *file, unsigned int line,
- const LogCategory &category, LogSeverity severity);
+ const LogCategory *category, LogSeverity severity);
#ifndef __DOXYGEN__
#define _LOG_CATEGORY(name) logCategory##name
#define _LOG1(severity) \
- _log(__FILE__, __LINE__, Log##severity).stream()
+ _log(__FILE__, __LINE__, nullptr, Log##severity).stream()
#define _LOG2(category, severity) \
- _log(__FILE__, __LINE__, _LOG_CATEGORY(category)(), Log##severity).stream()
+ _log(__FILE__, __LINE__, &_LOG_CATEGORY(category)(), Log##severity).stream()
/*
* Expand the LOG() macro to _LOG1() or _LOG2() based on the number of