From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 14 Oct 2025 10:32:35 +0000 (+0200)
Subject: */: s/READLINKNUL/readlinknul_a/
X-Git-Tag: 4.19.0-rc1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd87198678d865c5abb6035d6c212db60a911455;p=thirdparty%2Fshadow.git

*/: s/READLINKNUL/readlinknul_a/

This name better reflects that it handles arrays, and doesn't shout.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/fs/readlink/readlinknul.h b/lib/fs/readlink/readlinknul.h
index 2f8a2bdd6..ecec2f898 100644
--- a/lib/fs/readlink/readlinknul.h
+++ b/lib/fs/readlink/readlinknul.h
@@ -17,7 +17,8 @@
 #include "sizeof.h"
 
 
-#define READLINKNUL(link, buf)  readlinknul(link, buf, countof(buf))
+// readlinknul_a - read link nul-terminate array
+#define readlinknul_a(link, buf)  readlinknul(link, buf, countof(buf))
 
 
 ATTR_STRING(1)
@@ -25,7 +26,7 @@ inline ssize_t readlinknul(const char *restrict link, char *restrict buf,
     ssize_t size);
 
 
-// Similar to readlink(2), but terminate the string.
+// readlinknul - read link nul-terminate
 inline ssize_t
 readlinknul(const char *restrict link, char *restrict buf, ssize_t size)
 {
diff --git a/lib/tcbfuncs.c b/lib/tcbfuncs.c
index 7a99a60ca..8b72acc33 100644
--- a/lib/tcbfuncs.c
+++ b/lib/tcbfuncs.c
@@ -123,7 +123,7 @@ static /*@null@*/ char *shadowtcb_path_rel_existing (const char *name)
 		free (path);
 		return NULL;
 	}
-	if (READLINKNUL(path, link) == -1) {
+	if (readlinknul_a(path, link) == -1) {
 		fprintf (shadow_logfd,
 		         _("%s: Cannot read symbolic link %s: %s\n"),
 		         shadow_progname, path, strerrno());
diff --git a/lib/user_busy.c b/lib/user_busy.c
index 51f0a9ea3..d9103c539 100644
--- a/lib/user_busy.c
+++ b/lib/user_busy.c
@@ -100,10 +100,10 @@ static int different_namespace (const char *sname)
 
 	SNPRINTF(path, "/proc/%s/ns/user", sname);
 
-	if (READLINKNUL(path, buf) == -1)
+	if (readlinknul_a(path, buf) == -1)
 		return 0;
 
-	if (READLINKNUL("/proc/self/ns/user", buf2) == -1)
+	if (readlinknul_a("/proc/self/ns/user", buf2) == -1)
 		return 0;
 
 	if (streq(buf, buf2))