From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 7 Oct 2022 13:26:36 +0000 (+0200)
Subject: basic/stdio-util: allow xsprintf() to be used without any arguments
X-Git-Tag: v252-rc2~70^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=892dc967873cab3b8af158284a524d3148db674a;p=thirdparty%2Fsystemd.git

basic/stdio-util: allow xsprintf() to be used without any arguments

xsprintf(buf, "…: %m") would fail, now it works.
---

diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index 69d7062ec6f..f647f125ac8 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -9,16 +9,16 @@
 #include "macro.h"
 #include "memory-util.h"
 
-#define snprintf_ok(buf, len, fmt, ...)                                \
-        ({                                                             \
-                char *_buf = (buf);                                    \
-                size_t _len = (len);                                   \
-                int _snpf = snprintf(_buf, _len, (fmt), __VA_ARGS__);  \
-                _snpf >= 0 && (size_t) _snpf < _len ? _buf : NULL;     \
+#define snprintf_ok(buf, len, fmt, ...)                                 \
+        ({                                                              \
+                char *_buf = (buf);                                     \
+                size_t _len = (len);                                    \
+                int _snpf = snprintf(_buf, _len, (fmt), ##__VA_ARGS__); \
+                _snpf >= 0 && (size_t) _snpf < _len ? _buf : NULL;      \
         })
 
 #define xsprintf(buf, fmt, ...) \
-        assert_message_se(snprintf_ok(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__), "xsprintf: " #buf "[] must be big enough")
+        assert_message_se(snprintf_ok(buf, ELEMENTSOF(buf), fmt, ##__VA_ARGS__), "xsprintf: " #buf "[] must be big enough")
 
 #define VA_FORMAT_ADVANCE(format, ap)                                   \
 do {                                                                    \