From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 12 Aug 2022 11:54:49 +0000 (+0200)
Subject: basic: Drop memory-util.h include from stdio-util.h
X-Git-Tag: v253-rc1~56^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d80463ea2fb1445a66cfb9d06854162ab385ec66;p=thirdparty%2Fsystemd.git

basic: Drop memory-util.h include from stdio-util.h

We want to include stdio-util.h in log.h in a future commit. To avoid
circular includes, we need to drop the memory-util.h include from
stdio-util.h
---

diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index a29170e2036..4e93ac90c9a 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -7,7 +7,6 @@
 #include <sys/types.h>
 
 #include "macro.h"
-#include "memory-util.h"
 
 _printf_(3, 4)
 static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) {
@@ -32,7 +31,7 @@ do {                                                                    \
         size_t _i, _k;                                                  \
         /* See https://github.com/google/sanitizers/issues/992 */       \
         if (HAS_FEATURE_MEMORY_SANITIZER)                               \
-                zero(_argtypes);                                        \
+                memset(_argtypes, 0, sizeof(_argtypes));                \
         _k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
         assert(_k < ELEMENTSOF(_argtypes));                             \
         for (_i = 0; _i < _k; _i++) {                                   \