lib/, src/, tests/: Rename snprintf_() => stprintf()

For consistency with strTcpy(), call it sTprintf().

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0664e610d9cf271c76b390b6c0f41cf2e104047d..1ee8f1affe63e67b881dbc364be12c19486a67a5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -203,10 +203,10 @@ libshadow_la_SOURCES = \
        string/memset/memzero.h \
        string/sprintf/aprintf.c \
        string/sprintf/aprintf.h \
-       string/sprintf/snprintf.c \
-       string/sprintf/snprintf.h \
        string/sprintf/stpeprintf.c \
        string/sprintf/stpeprintf.h \
+       string/sprintf/stprintf.c \
+       string/sprintf/stprintf.h \
        string/strchr/strchrcnt.c \
        string/strchr/strchrcnt.h \
        string/strchr/strchrscnt.c \

diff --git a/lib/audit_help.c b/lib/audit_help.c
index b0ac5631e5eeca5edf2f6cd24390302948ef88f1..987465c3897661ff8f4533a9b64ff2b499bff8b6 100644 (file)
--- a/lib/audit_help.c
+++ b/lib/audit_help.c
@@ -25,7 +25,7 @@
 #include "attr.h"
 #include "prototypes.h"
 #include "shadowlog.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 
 int audit_fd;
 

diff --git a/lib/commonio.c b/lib/commonio.c
index 07927178ad65fc0f0e19e5745dcd49dacbafd842..b2038831837be022bf5bcc008ebadbd07c9c3bda 100644 (file)
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -34,7 +34,7 @@
 #include "sssd.h"
 #include "string/memset/memzero.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strerrno.h"

diff --git a/lib/env.c b/lib/env.c
index cdbd87d6260a0b901d90b2105d3e6fd16d6e95f6..37edc059074977e6f5275925d5c645c20c03e62e 100644 (file)
--- a/lib/env.c
+++ b/lib/env.c
@@ -19,8 +19,7 @@
 #include "defines.h"
 #include "shadowlog.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/snprintf.h"
-#include "string/sprintf/aprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strdup/strdup.h"
 

diff --git a/lib/get_pid.c b/lib/get_pid.c
index 6ccc79d79bb03427a03ca746d7edb611660ca9b3..719ddb4054ec82b9783ae18274f8143900c6e3e1 100644 (file)
--- a/lib/get_pid.c
+++ b/lib/get_pid.c
@@ -14,7 +14,7 @@
 #include "atoi/getnum.h"
 #include "defines.h"
 #include "prototypes.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strerrno.h"
 
 

diff --git a/lib/hushed.c b/lib/hushed.c
index 1b1fc40a2ec33922ed3493cf469fa5ae7bd6a844..d88549a647debcb96c523e9e326447db167db4da 100644 (file)
--- a/lib/hushed.c
+++ b/lib/hushed.c
@@ -22,7 +22,7 @@
 #include "getdef.h"
 #include "io/fgets/fgets.h"
 #include "prototypes.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strtok/stpsep.h"
 

diff --git a/lib/nss.c b/lib/nss.c
index 5957390741d6ed5b124c65718f2c45ab8a67cb3d..c487800e264ca253fbae38895748b621ae7bead3 100644 (file)
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -13,7 +13,7 @@
 #include "prototypes.h"
 #include "../libsubid/subid.h"
 #include "shadowlog.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/strcaseprefix.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"

diff --git a/lib/pwauth.c b/lib/pwauth.c
index 0f0d2ff77cf0f3e3077dc024ce607a39d28ddbe8..d8f61e3ea03df99e290aaa09bd62cd4b9b234283 100644 (file)
--- a/lib/pwauth.c
+++ b/lib/pwauth.c
@@ -25,7 +25,7 @@
 #include "pwauth.h"
 #include "getdef.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 
 #ifdef SKEY

diff --git a/lib/shell.c b/lib/shell.c
index 1e49df7b03465c2ea04b373798ea031728725759..b4738561f18ddacbe87afdeef998006e29999367 100644 (file)
--- a/lib/shell.c
+++ b/lib/shell.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include "prototypes.h"
 #include "defines.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 
 
 extern char **newenvp;

diff --git a/lib/string/README b/lib/string/README
index b8a231b408a09aa65ee13004a406abcfa3fbda4c..78cd6c713a348a9074af005e4de0c3ef79bb3ef5 100644 (file)
--- a/lib/string/README
+++ b/lib/string/README
@@ -213,7 +213,7 @@ sprintf/ - Formatted string creation
        sprintf(3) variant that allocates.
        It has better interface than asprintf(3).
 
-    stprintf()  // Current name: snprintf_()
+    stprintf()
        snprintf(3) wrapper that reports truncation with -1.
        If you need more than one call to form a string,
        use seprintf() instead.

diff --git a/lib/string/sprintf/stpeprintf.h b/lib/string/sprintf/stpeprintf.h
index dc422bade8dd7100db43aa642c76efd5bf91e712..4345722b55ed904cac90e6884ad5a0203b45915d 100644 (file)
--- a/lib/string/sprintf/stpeprintf.h
+++ b/lib/string/sprintf/stpeprintf.h
@@ -12,7 +12,7 @@
 #include <stddef.h>
 
 #include "attr.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 
 
 #if !defined(HAVE_STPEPRINTF)
@@ -53,7 +53,7 @@ vstpeprintf(char *dst, char *end, const char *restrict fmt, va_list ap)
                return NULL;
 
        size = end - dst;
-       len = vsnprintf_(dst, size, fmt, ap);
+       len = vstprintf(dst, size, fmt, ap);
        if (len == -1)
                return NULL;
 

diff --git a/lib/string/sprintf/snprintf.c b/lib/string/sprintf/stprintf.c
similarity index 62%
rename from lib/string/sprintf/snprintf.c
rename to lib/string/sprintf/stprintf.c
index f4ede2596ac79f844d68f0c9cddb7a416aea0295..1fe70550f7614111957668531b7a6727e4a0915d 100644 (file)
--- a/lib/string/sprintf/snprintf.c
+++ b/lib/string/sprintf/stprintf.c
@@ -4,13 +4,13 @@
 
 #include "config.h"
 
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 
 #include <stdarg.h>
 #include <sys/types.h>
 
 
-extern inline int snprintf_(char *restrict s, ssize_t size,
+extern inline int stprintf(char *restrict s, ssize_t size,
     const char *restrict fmt, ...);
-extern inline int vsnprintf_(char *restrict s, ssize_t size,
+extern inline int vstprintf(char *restrict s, ssize_t size,
     const char *restrict fmt, va_list ap);

diff --git a/lib/string/sprintf/snprintf.h b/lib/string/sprintf/stprintf.h
similarity index 66%
rename from lib/string/sprintf/snprintf.h
rename to lib/string/sprintf/stprintf.h
index bc55b9ba916f8cab56aee9cc5ef75d182a6b82a7..1488862d8e220b6598dc8871d7afcbf6e4b3c43b 100644 (file)
--- a/lib/string/sprintf/snprintf.h
+++ b/lib/string/sprintf/stprintf.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_SPRINTF_SNPRINTF_H_
-#define SHADOW_INCLUDE_LIB_STRING_SPRINTF_SNPRINTF_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_SPRINTF_STPRINTF_H_
+#define SHADOW_INCLUDE_LIB_STRING_SPRINTF_STPRINTF_H_
 
 
 #include "config.h"
@@ -19,30 +19,30 @@
 
 
 // stprintf_a - string truncate print formatted array
-#define stprintf_a(s, fmt, ...)                                               \
-(                                                                             \
-       snprintf_(s, countof(s), fmt __VA_OPT__(,) __VA_ARGS__)               \
+#define stprintf_a(s, fmt, ...)                                       \
+(                                                                     \
+       stprintf(s, countof(s), fmt __VA_OPT__(,) __VA_ARGS__)        \
 )
 
 
 // stprintf - string truncate print formatted
 format_attr(printf, 3, 4)
-inline int snprintf_(char *restrict s, ssize_t size,
+inline int stprintf(char *restrict s, ssize_t size,
     const char *restrict fmt, ...);
 // vstprintf - va_list string truncate print formatted
 format_attr(printf, 3, 0)
-inline int vsnprintf_(char *restrict s, ssize_t size,
+inline int vstprintf(char *restrict s, ssize_t size,
     const char *restrict fmt, va_list ap);
 
 
 inline int
-snprintf_(char *restrict s, ssize_t size, const char *restrict fmt, ...)
+stprintf(char *restrict s, ssize_t size, const char *restrict fmt, ...)
 {
        int      len;
        va_list  ap;
 
        va_start(ap, fmt);
-       len = vsnprintf_(s, size, fmt, ap);
+       len = vstprintf(s, size, fmt, ap);
        va_end(ap);
 
        return len;
@@ -50,7 +50,7 @@ snprintf_(char *restrict s, ssize_t size, const char *restrict fmt, ...)
 
 
 inline int
-vsnprintf_(char *restrict s, ssize_t size, const char *restrict fmt, va_list ap)
+vstprintf(char *restrict s, ssize_t size, const char *restrict fmt, va_list ap)
 {
        int  len;
 

diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index a983f9311e51a686a5444295a09549b93c482ac6..357ec5462124718a57a7401a6e765938b8fc66f4 100644 (file)
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -25,7 +25,7 @@
 #include "atoi/getnum.h"
 #include "shadow/passwd/getpw.h"
 #include "string/ctype/strisascii/strisdigit.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strtok/strsep2arr.h"
 

diff --git a/lib/user_busy.c b/lib/user_busy.c
index c2a1829f8e45193d995117c1dc8a63c7a45679a3..d157b5749558d4100169579a4062f0a8bc9c36ed 100644 (file)
--- a/lib/user_busy.c
+++ b/lib/user_busy.c
@@ -26,7 +26,7 @@
 #include "subordinateio.h"
 #endif                         /* ENABLE_SUBIDS */
 #include "shadowlog.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strneq.h"
 #include "string/strcmp/strprefix.h"

diff --git a/src/chage.c b/src/chage.c
index 8e27c5fd5922ffd14e0d64efa124ea749226bf1d..ae739ee694040ad4b64ba4a6a79e0df4f28a6964 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -29,7 +29,7 @@
 #include "shadowio.h"
 #include "shadowlog.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/strtcpy.h"
 #include "string/strerrno.h"

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 6ffbc100921a737e8a9cfc88ffac454a175923e9..bb53087c6f796795ac2fcdb285c3e544a819dbc0 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -36,7 +36,7 @@
 #include "shadowlog.h"
 #include "sssd.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/strtcpy.h"
 #include "string/strdup/strdup.h"

diff --git a/src/login.c b/src/login.c
index 9ea732c1ac0952c5f87db9f4a1b0bc9ae4cbe52d..59e39b2b4df8db76d5346ae58003769c2c050324 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -39,7 +39,7 @@
 #include "shadow/gshadow/endsgent.h"
 #include "shadowlog.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strneq.h"
 #include "string/strcmp/strprefix.h"

diff --git a/src/newgrp.c b/src/newgrp.c
index d081cf2b5b54a907a3700b804abc9507931cac06..afe4d851857f5f70913e3049f9ea377a8d0039f1 100644 (file)
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -32,7 +32,7 @@
 #include "shadow/gshadow/getsgnam.h"
 #include "shadow/gshadow/sgrp.h"
 #include "shadowlog.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strdup/strdup.h"

diff --git a/src/newusers.c b/src/newusers.c
index 5a6cfefefc191939487abb5cf171be214a73e91c..6bae4b343399137360399125c64346f27db474df 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -52,7 +52,7 @@
 #include "shadow/gshadow/sgrp.h"
 #include "shadowlog.h"
 #include "sssd.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strdup/strdup.h"
 #include "string/strerrno.h"

diff --git a/src/passwd.c b/src/passwd.c
index 6fd2366e917c8bf0384c6769d9dd6ceb0d729271..b2cac80b007940bf57408ca0f966e76e017ab777 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -34,7 +34,7 @@
 #include "sssd.h"
 #include "string/memset/memzero.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strcpy/strtcpy.h"

diff --git a/src/useradd.c b/src/useradd.c
index c0e28ef8b7a311ebcb147557c62fb26a6bc194f6..e6c80bd6f1561d801fb41020a5f7559b3c418d02 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -65,7 +65,7 @@
 #include "sssd.h"
 #include "string/memset/memzero.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"

diff --git a/src/vipw.c b/src/vipw.c
index f6a3b72eee99af74cbd492adc8f12f5fe70bd5b1..76edd42a52722b83c521942762f3531b73d15cc1 100644 (file)
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -45,7 +45,7 @@
 #include "sssd.h"
 #include "fs/mkstemp/fmkomstemp.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/snprintf.h"
+#include "string/sprintf/stprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strerrno.h"
 

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 74f6721107eeebe56e8f7f2d731b7c4ef22503d9..95dc5b797e4cec29fcfb9279c908e609a29fa463 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -8,7 +8,7 @@ check_PROGRAMS = \
     test_atoi_strtoi \
     test_chkhash \
     test_chkname \
-    test_snprintf \
+    test_stprintf \
     test_strncpy \
     test_strtcpy \
     test_typetraits \
@@ -94,16 +94,16 @@ test_logind_LDADD = \
     $(LIBSYSTEMD) \
     $(NULL)
 
-test_snprintf_SOURCES = \
-    ../../lib/string/sprintf/snprintf.c \
-    test_snprintf.c \
+test_stprintf_SOURCES = \
+    ../../lib/string/sprintf/stprintf.c \
+    test_stprintf.c \
     $(NULL)
-test_snprintf_CFLAGS = \
+test_stprintf_CFLAGS = \
     $(AM_CFLAGS) \
     $(NULL)
-test_snprintf_LDFLAGS = \
+test_stprintf_LDFLAGS = \
     $(NULL)
-test_snprintf_LDADD = \
+test_stprintf_LDADD = \
     $(CMOCKA_LIBS) \
     $(NULL)
 

diff --git a/tests/unit/test_snprintf.c b/tests/unit/test_stprintf.c
similarity index 97%
rename from tests/unit/test_snprintf.c
rename to tests/unit/test_stprintf.c
index f082ef0f2a6fa5823d93b79d0b5d2eaa55c65a91..94c0bd9dcd09eca0212ffbe7ad094ffbd8b572d9 100644 (file)
--- a/tests/unit/test_snprintf.c
+++ b/tests/unit/test_stprintf.c
@@ -13,9 +13,10 @@
 #include <stdint.h>  // Required by <cmocka.h>
 #include <cmocka.h>
 
-#include "sizeof.h"
-#include "string/sprintf/snprintf.h"
 #include "attr.h"
+#include "sizeof.h"
+#include "string/sprintf/stprintf.h"
+
 
 static void test_stprintf_a_trunc(MAYBE_UNUSED void ** _1);
 static void test_stprintf_a_ok(MAYBE_UNUSED void ** _1);