From 5bf3551ab6b9565ecdc9bd22dfad0dc7a7bc978f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tin=20=C5=A0vagelj?= <tin.svagelj@live.com>
Date: Sat, 25 May 2024 22:11:51 +0200
Subject: [PATCH] Replace vararg function with template varargs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
---
 src/colours.cc | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/colours.cc b/src/colours.cc
index 16d8c8fd5..a2baa64a8 100644
--- a/src/colours.cc
+++ b/src/colours.cc
@@ -31,7 +31,6 @@
 
 #include "logging.h"
 
-#include <cstdarg>
 #include <cstdio>
 #include <optional>
 
@@ -57,15 +56,13 @@ Colour Colour::from_argb32(uint32_t argb) {
 #endif /* BUILD_COLOUR_NAME_MAP */
 
 std::optional<Colour> inline no_colour() { return std::nullopt; }
+template <typename... Args>
 std::optional<Colour> parse_error(const std::string &color_str,
-                                  const char *format...) {
-  va_list args;
-  va_start(args, format);
-  size_t len = snprintf(nullptr, 0, format, args);
+                                  const char *format, Args... args) {
+  size_t len = snprintf(nullptr, 0, format, args...);
 
   char *reason = new char[len + 1];
-  snprintf(reason, len + 1, format, args);
-  va_end(args);
+  snprintf(reason, len + 1, format, args...);
 
   CRIT_ERR("can't parse color '%s' (len: %d): %s", color_str.c_str(),
            color_str.length(), reason);