[PATCH v4 3/8] libcamera: base: log: Remove `LogMessage::init()`

[Jacopo Mondi]

Hi Barnabás

On Tue, Feb 25, 2025 at 05:35:53PM +0000, Barnabás Pőcze wrote:
> It is a short function that can be merged into the constructor with
> essentially no change in observable behaviour, so do that.
>
> Signed-off-by: Barnabás Pőcze <pobrn at protonmail.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  include/libcamera/base/log.h |  2 --
>  src/libcamera/base/log.cpp   | 16 ++++------------
>  2 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/include/libcamera/base/log.h b/include/libcamera/base/log.h
> index b3050eedb..6d2c93019 100644
> --- a/include/libcamera/base/log.h
> +++ b/include/libcamera/base/log.h
> @@ -75,8 +75,6 @@ public:
>  private:
>  	LIBCAMERA_DISABLE_COPY_AND_MOVE(LogMessage)
>
> -	void init(const char *fileName, unsigned int line);
> -
>  	std::ostringstream msgStream_;
>  	const LogCategory &category_;
>  	LogSeverity severity_;
> diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp
> index 42514de97..a43ed9684 100644
> --- a/src/libcamera/base/log.cpp
> +++ b/src/libcamera/base/log.cpp
> @@ -861,19 +861,11 @@ const LogCategory &LogCategory::defaultCategory()
>  LogMessage::LogMessage(const char *fileName, unsigned int line,
>  		       const LogCategory &category, LogSeverity severity,
>  		       const std::string &prefix)
> -	: category_(category), severity_(severity), prefix_(prefix)
> +	: category_(category), severity_(severity),
> +	  timestamp_(utils::clock::now()),
> +	  fileInfo_((std::ostringstream() << utils::basename(fileName) << ":" << line).str()),

meh, matter of tastes

Reviewed-by: Jacopo Mondi <jacopo.mondi at ideasonboard.com>

> +	  prefix_(prefix)
>  {
> -	init(fileName, line);
> -}
> -
> -void LogMessage::init(const char *fileName, unsigned int line)
> -{
> -	/* Log the timestamp, severity and file information. */
> -	timestamp_ = utils::clock::now();
> -
> -	std::ostringstream ossFileInfo;
> -	ossFileInfo << utils::basename(fileName) << ":" << line;
> -	fileInfo_ = ossFileInfo.str();
>  }
>
>  LogMessage::~LogMessage()
> --
> 2.48.1
>
>