From: Alejandro Colomar <alx@kernel.org>
Date: Sun, 30 Jul 2023 16:45:47 +0000 (+0200)
Subject: zustr2stp.h: Add ZUSTR2STP() macro
X-Git-Tag: 4.15.0-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=983a8446337abd80cce3883a864b82367b78d52f;p=thirdparty%2Fshadow.git

zustr2stp.h: Add ZUSTR2STP() macro

It's a wrapper around zustr2stp() that calls SIZEOF_ARRAY() internally.
The function call is usually --in our code base, always-- called with an
array as the second argument.  For such an argument, one should call
SIZEOF_ARRAY().  To avoid mistakes, and simplify usage, let's add this
macro that does it internally.

BTW, this macro doesn't have any issues of double evaluation, because
sizeof() doesn't evaluate its argument (unless it's a VLA, but then
the static_assert(3) within SIZEOF_ARRAY() makes sure VLAs are not
allowed).

Cc: Christian Göttsche <cgzones@googlemail.com>
Cc: Serge Hallyn <serge@hallyn.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/zustr2stp.h b/lib/zustr2stp.h
index 987a7ba80..7775fc6da 100644
--- a/lib/zustr2stp.h
+++ b/lib/zustr2stp.h
@@ -14,6 +14,10 @@
 #include <string.h>
 
 #include "mempcpy.h"
+#include "sizeof.h"
+
+
+#define ZUSTR2STP(dst, src)  zustr2stp(dst, src, SIZEOF_ARRAY(src))
 
 
 inline char *zustr2stp(char *restrict dst, const char *restrict src, size_t sz);