From: Alejandro Colomar Date: Sat, 8 Feb 2025 15:30:58 +0000 (+0100) Subject: lib/, src/, tests/: Rename snprintf_() => stprintf() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=840519ba8de9473235b2639f7e9dfe252ee0dcb3;p=thirdparty%2Fshadow.git lib/, src/, tests/: Rename snprintf_() => stprintf() For consistency with strTcpy(), call it sTprintf(). Signed-off-by: Alejandro Colomar --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 0664e610d..1ee8f1aff 100644 --- 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 b0ac5631e..987465c38 100644 --- 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 07927178a..b20388318 100644 --- 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 cdbd87d62..37edc0590 100644 --- 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 6ccc79d79..719ddb405 100644 --- 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 1b1fc40a2..d88549a64 100644 --- 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 595739074..c487800e2 100644 --- 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 0f0d2ff77..d8f61e3ea 100644 --- 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 1e49df7b0..b4738561f 100644 --- a/lib/shell.c +++ b/lib/shell.c @@ -15,7 +15,7 @@ #include #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 b8a231b40..78cd6c713 100644 --- 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 dc422bade..4345722b5 100644 --- a/lib/string/sprintf/stpeprintf.h +++ b/lib/string/sprintf/stpeprintf.h @@ -12,7 +12,7 @@ #include #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 f4ede2596..1fe70550f 100644 --- 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 #include -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 bc55b9ba9..1488862d8 100644 --- 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 a983f9311..357ec5462 100644 --- 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 c2a1829f8..d157b5749 100644 --- 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 8e27c5fd5..ae739ee69 100644 --- 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 6ffbc1009..bb53087c6 100644 --- 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 9ea732c1a..59e39b2b4 100644 --- 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 d081cf2b5..afe4d8518 100644 --- 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 5a6cfefef..6bae4b343 100644 --- 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 6fd2366e9..b2cac80b0 100644 --- 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 c0e28ef8b..e6c80bd6f 100644 --- 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 f6a3b72ee..76edd42a5 100644 --- 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 74f672110..95dc5b797 100644 --- 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 f082ef0f2..94c0bd9dc 100644 --- a/tests/unit/test_snprintf.c +++ b/tests/unit/test_stprintf.c @@ -13,9 +13,10 @@ #include // Required by #include -#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);