*/: 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 2f8a2bdd63a9b4afd643cdcf2702ac6d105b7182..ecec2f898d2cca2876d9c29e29082ab5bee956fe 100644 (file)
--- 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 7a99a60ca6f8c8971bdf35a29f09df53e3becccb..8b72acc33479d16440e31980d2522369d0dac8c9 100644 (file)
--- 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 51f0a9ea37cdd9742138ce5d62d1d74a225f8aa3..d9103c53911624a2ff0adf5a1bf7763c5ad5eeda 100644 (file)
--- 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))