The naming of functions that I proposed in
<https://lists.gnu.org/archive/html/bug-gnulib/2024-04/msg00352.html>
is inconsistent: The 'z' letter comes before the 's' for the string
functions but after the 'd', 'f' for the file descriptor or file stream
based functions.
Recall that the 'z' means essentially the same thing in all cases
(because ptrdiff_t and off64_t are the same thing on 64-bit platforms).
I like to keep 'd' and 'f' (and 'v', of course) as prefixes. So, to have
consistency, better rename
*zsprintf -> *szprintf
*zsnprintf -> *snzprintf
Done as follows.
2024-06-29 Bruno Haible <br...@clisp.org>
Global rename *zs[n]printf -> *s[n]zprintf.
* lib/aszprintf.c: Renamed from lib/azsprintf.c.
* lib/c-aszprintf.c: Renamed from lib/c-azsprintf.c.
* lib/c-vaszprintf.c: Renamed from lib/c-vazsprintf.c.
* lib/c-vsnzprintf.c: Renamed from lib/c-vzsnprintf.c.
* lib/c-snzprintf.c: Renamed from lib/c-zsnprintf.c.
* lib/vaszprintf.c: Renamed from lib/vazsprintf.c.
* lib/vsnzprintf.c: Renamed from lib/vzsnprintf.c.
* lib/vszprintf.c: Renamed from lib/vzsprintf.c.
* lib/snzprintf.c: Renamed from lib/zsnprintf.c.
* lib/szprintf.c: Renamed from lib/zsprintf.c.
* tests/test-c-vaszprintf-gnu.c: Renamed from
tests/test-c-vazsprintf-gnu.c.
* tests/test-c-vaszprintf-gnu.sh: Renamed from
tests/test-c-vazsprintf-gnu.sh.
* tests/test-c-vsnzprintf-gnu.c: Renamed from
tests/test-c-vzsnprintf-gnu.c.
* tests/test-c-vsnzprintf-gnu.sh: Renamed from
tests/test-c-vzsnprintf-gnu.sh.
* tests/test-c-snzprintf-gnu.c: Renamed from
tests/test-c-zsnprintf-gnu.c.
* tests/test-c-snzprintf-gnu.sh: Renamed from
tests/test-c-zsnprintf-gnu.sh.
* tests/test-vaszprintf-gnu.c: Renamed from tests/test-vazsprintf-gnu.c.
* tests/test-vaszprintf-gnu.h: Renamed from tests/test-vazsprintf-gnu.h.
* tests/test-vaszprintf-posix.c: Renamed from
tests/test-vazsprintf-posix.c.
* tests/test-vsnzprintf-gnu.c: Renamed from tests/test-vzsnprintf-gnu.c.
* tests/test-vsnzprintf-posix.c: Renamed from
tests/test-vzsnprintf-posix.c.
* tests/test-vszprintf-gnu.c: Renamed from tests/test-vzsprintf-gnu.c.
* tests/test-vszprintf-posix.c: Renamed from
tests/test-vzsprintf-posix.c.
* tests/test-snzprintf-gnu.c: Renamed from tests/test-zsnprintf-gnu.c.
* tests/test-snzprintf-gnu.h: Renamed from tests/test-zsnprintf-gnu.h.
* tests/test-snzprintf-posix.c: Renamed from
tests/test-zsnprintf-posix.c.
* tests/test-snzprintf-posix.h: Renamed from
tests/test-zsnprintf-posix.h.
* tests/test-szprintf-gnu.c: Renamed from tests/test-zsprintf-gnu.c.
* tests/test-szprintf-gnu.h: Renamed from tests/test-zsprintf-gnu.h.
* tests/test-szprintf-posix.c: Renamed from tests/test-zsprintf-posix.c.
* tests/test-szprintf-posix.h: Renamed from tests/test-zsprintf-posix.h.
* modules/c-vaszprintf: Renamed from modules/c-vazsprintf.
* modules/c-vaszprintf-gnu: Renamed from modules/c-vazsprintf-gnu.
* modules/c-vaszprintf-gnu-tests: Renamed from
modules/c-vazsprintf-gnu-tests.
* modules/c-vsnzprintf: Renamed from modules/c-vzsnprintf.
* modules/c-vsnzprintf-gnu: Renamed from modules/c-vzsnprintf-gnu.
* modules/c-vsnzprintf-gnu-tests: Renamed from
modules/c-vzsnprintf-gnu-tests.
* modules/c-snzprintf: Renamed from modules/c-zsnprintf.
* modules/c-snzprintf-gnu: Renamed from modules/c-zsnprintf-gnu.
* modules/c-snzprintf-gnu-tests: Renamed from
modules/c-zsnprintf-gnu-tests.
* modules/vaszprintf: Renamed from modules/vazsprintf.
* modules/vaszprintf-gnu: Renamed from modules/vazsprintf-gnu.
* modules/vaszprintf-gnu-tests: Renamed from
modules/vazsprintf-gnu-tests.
* modules/vaszprintf-posix: Renamed from modules/vazsprintf-posix.
* modules/vaszprintf-posix-tests: Renamed from
modules/vazsprintf-posix-tests.
* modules/vsnzprintf: Renamed from modules/vzsnprintf.
* modules/vsnzprintf-gnu: Renamed from modules/vzsnprintf-gnu.
* modules/vsnzprintf-gnu-tests: Renamed from
modules/vzsnprintf-gnu-tests.
* modules/vsnzprintf-posix: Renamed from modules/vzsnprintf-posix.
* modules/vsnzprintf-posix-tests: Renamed from
modules/vzsnprintf-posix-tests.
* modules/vszprintf: Renamed from modules/vzsprintf.
* modules/vszprintf-gnu: Renamed from modules/vzsprintf-gnu.
* modules/vszprintf-gnu-tests: Renamed from modules/vzsprintf-gnu-tests.
* modules/vszprintf-posix: Renamed from modules/vzsprintf-posix.
* modules/vszprintf-posix-tests: Renamed from
modules/vzsprintf-posix-tests.
* modules/snzprintf: Renamed from modules/zsnprintf.
* modules/snzprintf-gnu: Renamed from modules/zsnprintf-gnu.
* modules/snzprintf-gnu-tests: Renamed from modules/zsnprintf-gnu-tests.
* modules/snzprintf-posix: Renamed from modules/zsnprintf-posix.
* modules/snzprintf-posix-tests: Renamed from
modules/zsnprintf-posix-tests.
* modules/szprintf: Renamed from modules/zsprintf.
* modules/szprintf-gnu: Renamed from modules/zsprintf-gnu.
* modules/szprintf-gnu-tests: Renamed from modules/zsprintf-gnu-tests.
* modules/szprintf-posix: Renamed from modules/zsprintf-posix.
* modules/szprintf-posix-tests: Renamed from
modules/zsprintf-posix-tests.
All function names updated.
* lib/stdio.in.h, m4/stdio_h.m4, modules/stdio: Update module indicator
names.
From d933b6be13824203ddd9a6bbb64e64ecf6065ebc Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Sun, 30 Jun 2024 01:32:24 +0200
Subject: [PATCH] Global rename *zs[n]printf -> *s[n]zprintf.
* lib/aszprintf.c: Renamed from lib/azsprintf.c.
* lib/c-aszprintf.c: Renamed from lib/c-azsprintf.c.
* lib/c-vaszprintf.c: Renamed from lib/c-vazsprintf.c.
* lib/c-vsnzprintf.c: Renamed from lib/c-vzsnprintf.c.
* lib/c-snzprintf.c: Renamed from lib/c-zsnprintf.c.
* lib/vaszprintf.c: Renamed from lib/vazsprintf.c.
* lib/vsnzprintf.c: Renamed from lib/vzsnprintf.c.
* lib/vszprintf.c: Renamed from lib/vzsprintf.c.
* lib/snzprintf.c: Renamed from lib/zsnprintf.c.
* lib/szprintf.c: Renamed from lib/zsprintf.c.
* tests/test-c-vaszprintf-gnu.c: Renamed from
tests/test-c-vazsprintf-gnu.c.
* tests/test-c-vaszprintf-gnu.sh: Renamed from
tests/test-c-vazsprintf-gnu.sh.
* tests/test-c-vsnzprintf-gnu.c: Renamed from
tests/test-c-vzsnprintf-gnu.c.
* tests/test-c-vsnzprintf-gnu.sh: Renamed from
tests/test-c-vzsnprintf-gnu.sh.
* tests/test-c-snzprintf-gnu.c: Renamed from
tests/test-c-zsnprintf-gnu.c.
* tests/test-c-snzprintf-gnu.sh: Renamed from
tests/test-c-zsnprintf-gnu.sh.
* tests/test-vaszprintf-gnu.c: Renamed from tests/test-vazsprintf-gnu.c.
* tests/test-vaszprintf-gnu.h: Renamed from tests/test-vazsprintf-gnu.h.
* tests/test-vaszprintf-posix.c: Renamed from
tests/test-vazsprintf-posix.c.
* tests/test-vsnzprintf-gnu.c: Renamed from tests/test-vzsnprintf-gnu.c.
* tests/test-vsnzprintf-posix.c: Renamed from
tests/test-vzsnprintf-posix.c.
* tests/test-vszprintf-gnu.c: Renamed from tests/test-vzsprintf-gnu.c.
* tests/test-vszprintf-posix.c: Renamed from
tests/test-vzsprintf-posix.c.
* tests/test-snzprintf-gnu.c: Renamed from tests/test-zsnprintf-gnu.c.
* tests/test-snzprintf-gnu.h: Renamed from tests/test-zsnprintf-gnu.h.
* tests/test-snzprintf-posix.c: Renamed from
tests/test-zsnprintf-posix.c.
* tests/test-snzprintf-posix.h: Renamed from
tests/test-zsnprintf-posix.h.
* tests/test-szprintf-gnu.c: Renamed from tests/test-zsprintf-gnu.c.
* tests/test-szprintf-gnu.h: Renamed from tests/test-zsprintf-gnu.h.
* tests/test-szprintf-posix.c: Renamed from tests/test-zsprintf-posix.c.
* tests/test-szprintf-posix.h: Renamed from tests/test-zsprintf-posix.h.
* modules/c-vaszprintf: Renamed from modules/c-vazsprintf.
* modules/c-vaszprintf-gnu: Renamed from modules/c-vazsprintf-gnu.
* modules/c-vaszprintf-gnu-tests: Renamed from
modules/c-vazsprintf-gnu-tests.
* modules/c-vsnzprintf: Renamed from modules/c-vzsnprintf.
* modules/c-vsnzprintf-gnu: Renamed from modules/c-vzsnprintf-gnu.
* modules/c-vsnzprintf-gnu-tests: Renamed from
modules/c-vzsnprintf-gnu-tests.
* modules/c-snzprintf: Renamed from modules/c-zsnprintf.
* modules/c-snzprintf-gnu: Renamed from modules/c-zsnprintf-gnu.
* modules/c-snzprintf-gnu-tests: Renamed from
modules/c-zsnprintf-gnu-tests.
* modules/vaszprintf: Renamed from modules/vazsprintf.
* modules/vaszprintf-gnu: Renamed from modules/vazsprintf-gnu.
* modules/vaszprintf-gnu-tests: Renamed from
modules/vazsprintf-gnu-tests.
* modules/vaszprintf-posix: Renamed from modules/vazsprintf-posix.
* modules/vaszprintf-posix-tests: Renamed from
modules/vazsprintf-posix-tests.
* modules/vsnzprintf: Renamed from modules/vzsnprintf.
* modules/vsnzprintf-gnu: Renamed from modules/vzsnprintf-gnu.
* modules/vsnzprintf-gnu-tests: Renamed from
modules/vzsnprintf-gnu-tests.
* modules/vsnzprintf-posix: Renamed from modules/vzsnprintf-posix.
* modules/vsnzprintf-posix-tests: Renamed from
modules/vzsnprintf-posix-tests.
* modules/vszprintf: Renamed from modules/vzsprintf.
* modules/vszprintf-gnu: Renamed from modules/vzsprintf-gnu.
* modules/vszprintf-gnu-tests: Renamed from modules/vzsprintf-gnu-tests.
* modules/vszprintf-posix: Renamed from modules/vzsprintf-posix.
* modules/vszprintf-posix-tests: Renamed from
modules/vzsprintf-posix-tests.
* modules/snzprintf: Renamed from modules/zsnprintf.
* modules/snzprintf-gnu: Renamed from modules/zsnprintf-gnu.
* modules/snzprintf-gnu-tests: Renamed from modules/zsnprintf-gnu-tests.
* modules/snzprintf-posix: Renamed from modules/zsnprintf-posix.
* modules/snzprintf-posix-tests: Renamed from
modules/zsnprintf-posix-tests.
* modules/szprintf: Renamed from modules/zsprintf.
* modules/szprintf-gnu: Renamed from modules/zsprintf-gnu.
* modules/szprintf-gnu-tests: Renamed from modules/zsprintf-gnu-tests.
* modules/szprintf-posix: Renamed from modules/zsprintf-posix.
* modules/szprintf-posix-tests: Renamed from
modules/zsprintf-posix-tests.
All function names updated.
* lib/stdio.in.h, m4/stdio_h.m4, modules/stdio: Update module indicator
names.
---
ChangeLog | 93 +++++++++++++++++++
lib/{azsprintf.c => aszprintf.c} | 4 +-
lib/{c-azsprintf.c => c-aszprintf.c} | 4 +-
lib/c-snprintf.c | 2 +-
lib/c-snprintf.h | 2 +-
lib/{c-zsnprintf.c => c-snzprintf.c} | 2 +-
lib/c-vasprintf.h | 4 +-
lib/{c-vazsprintf.c => c-vaszprintf.c} | 2 +-
lib/c-vsnprintf.c | 2 +-
lib/c-vsnprintf.h | 2 +-
lib/{c-vzsnprintf.c => c-vsnzprintf.c} | 2 +-
lib/c-xvasprintf.c | 2 +-
lib/snprintf.c | 2 +-
lib/{zsnprintf.c => snzprintf.c} | 2 +-
lib/sprintf.c | 2 +-
lib/stdio.in.h | 34 +++----
lib/{zsprintf.c => szprintf.c} | 2 +-
lib/{vazsprintf.c => vaszprintf.c} | 2 +-
lib/vsnprintf.c | 2 +-
lib/{vzsnprintf.c => vsnzprintf.c} | 2 +-
lib/vsprintf.c | 2 +-
lib/{vzsprintf.c => vszprintf.c} | 2 +-
lib/xvasprintf.c | 2 +-
m4/stdio_h.m4 | 10 +-
modules/c-snprintf | 2 +-
modules/{c-zsnprintf => c-snzprintf} | 6 +-
modules/{c-zsnprintf-gnu => c-snzprintf-gnu} | 4 +-
modules/c-snzprintf-gnu-tests | 19 ++++
modules/{c-vazsprintf => c-vaszprintf} | 8 +-
.../{c-vazsprintf-gnu => c-vaszprintf-gnu} | 4 +-
modules/c-vaszprintf-gnu-tests | 19 ++++
modules/c-vazsprintf-gnu-tests | 19 ----
modules/c-vsnprintf | 2 +-
modules/{c-vzsnprintf => c-vsnzprintf} | 6 +-
.../{c-vzsnprintf-gnu => c-vsnzprintf-gnu} | 4 +-
modules/c-vsnzprintf-gnu-tests | 19 ++++
modules/c-vzsnprintf-gnu-tests | 19 ----
modules/c-xvasprintf | 2 +-
modules/c-zsnprintf-gnu-tests | 19 ----
modules/snprintf | 2 +-
modules/{zsnprintf => snzprintf} | 8 +-
modules/{zsnprintf-gnu => snzprintf-gnu} | 4 +-
modules/snzprintf-gnu-tests | 12 +++
modules/{zsnprintf-posix => snzprintf-posix} | 4 +-
modules/snzprintf-posix-tests | 14 +++
modules/sprintf-posix | 2 +-
modules/stdio | 10 +-
modules/{zsprintf => szprintf} | 8 +-
modules/{zsprintf-gnu => szprintf-gnu} | 4 +-
modules/szprintf-gnu-tests | 12 +++
modules/{zsprintf-posix => szprintf-posix} | 4 +-
modules/szprintf-posix-tests | 14 +++
modules/{vazsprintf => vaszprintf} | 12 +--
modules/{vazsprintf-gnu => vaszprintf-gnu} | 4 +-
modules/vaszprintf-gnu-tests | 12 +++
.../{vazsprintf-posix => vaszprintf-posix} | 4 +-
modules/vaszprintf-posix-tests | 13 +++
modules/vazsprintf-gnu-tests | 12 ---
modules/vazsprintf-posix-tests | 13 ---
modules/vsnprintf | 2 +-
modules/{vzsnprintf => vsnzprintf} | 8 +-
modules/{vzsnprintf-gnu => vsnzprintf-gnu} | 4 +-
modules/vsnzprintf-gnu-tests | 12 +++
.../{vzsnprintf-posix => vsnzprintf-posix} | 4 +-
modules/vsnzprintf-posix-tests | 14 +++
modules/vsprintf-posix | 2 +-
modules/{vzsprintf => vszprintf} | 8 +-
modules/{vzsprintf-gnu => vszprintf-gnu} | 4 +-
modules/vszprintf-gnu-tests | 12 +++
modules/{vzsprintf-posix => vszprintf-posix} | 4 +-
modules/vszprintf-posix-tests | 14 +++
modules/vzsnprintf-gnu-tests | 12 ---
modules/vzsnprintf-posix-tests | 14 ---
modules/vzsprintf-gnu-tests | 12 ---
modules/vzsprintf-posix-tests | 14 ---
modules/xvasprintf | 2 +-
modules/zsnprintf-gnu-tests | 12 ---
modules/zsnprintf-posix-tests | 14 ---
modules/zsprintf-gnu-tests | 12 ---
modules/zsprintf-posix-tests | 14 ---
...zsnprintf-gnu.c => test-c-snzprintf-gnu.c} | 6 +-
...nprintf-gnu.sh => test-c-snzprintf-gnu.sh} | 2 +-
...zsprintf-gnu.c => test-c-vaszprintf-gnu.c} | 20 ++--
...printf-gnu.sh => test-c-vaszprintf-gnu.sh} | 2 +-
...snprintf-gnu.c => test-c-vsnzprintf-gnu.c} | 10 +-
...printf-gnu.sh => test-c-vsnzprintf-gnu.sh} | 2 +-
...t-zsnprintf-gnu.c => test-snzprintf-gnu.c} | 6 +-
...t-zsnprintf-gnu.h => test-snzprintf-gnu.h} | 6 +-
...nprintf-posix.c => test-snzprintf-posix.c} | 6 +-
...nprintf-posix.h => test-snzprintf-posix.h} | 30 +++---
...est-zsprintf-gnu.c => test-szprintf-gnu.c} | 6 +-
...est-zsprintf-gnu.h => test-szprintf-gnu.h} | 6 +-
...zsprintf-posix.c => test-szprintf-posix.c} | 6 +-
...zsprintf-posix.h => test-szprintf-posix.h} | 30 +++---
...vazsprintf-gnu.c => test-vaszprintf-gnu.c} | 20 ++--
...vazsprintf-gnu.h => test-vaszprintf-gnu.h} | 6 +-
...printf-posix.c => test-vaszprintf-posix.c} | 46 ++++-----
...vzsnprintf-gnu.c => test-vsnzprintf-gnu.c} | 10 +-
...printf-posix.c => test-vsnzprintf-posix.c} | 10 +-
...t-vzsprintf-gnu.c => test-vszprintf-gnu.c} | 10 +-
...sprintf-posix.c => test-vszprintf-posix.c} | 10 +-
101 files changed, 521 insertions(+), 428 deletions(-)
rename lib/{azsprintf.c => aszprintf.c} (90%)
rename lib/{c-azsprintf.c => c-aszprintf.c} (90%)
rename lib/{c-zsnprintf.c => c-snzprintf.c} (96%)
rename lib/{c-vazsprintf.c => c-vaszprintf.c} (95%)
rename lib/{c-vzsnprintf.c => c-vsnzprintf.c} (96%)
rename lib/{zsnprintf.c => snzprintf.c} (96%)
rename lib/{zsprintf.c => szprintf.c} (97%)
rename lib/{vazsprintf.c => vaszprintf.c} (95%)
rename lib/{vzsnprintf.c => vsnzprintf.c} (96%)
rename lib/{vzsprintf.c => vszprintf.c} (96%)
rename modules/{c-zsnprintf => c-snzprintf} (67%)
rename modules/{c-zsnprintf-gnu => c-snzprintf-gnu} (87%)
create mode 100644 modules/c-snzprintf-gnu-tests
rename modules/{c-vazsprintf => c-vaszprintf} (57%)
rename modules/{c-vazsprintf-gnu => c-vaszprintf-gnu} (81%)
create mode 100644 modules/c-vaszprintf-gnu-tests
delete mode 100644 modules/c-vazsprintf-gnu-tests
rename modules/{c-vzsnprintf => c-vsnzprintf} (70%)
rename modules/{c-vzsnprintf-gnu => c-vsnzprintf-gnu} (86%)
create mode 100644 modules/c-vsnzprintf-gnu-tests
delete mode 100644 modules/c-vzsnprintf-gnu-tests
delete mode 100644 modules/c-zsnprintf-gnu-tests
rename modules/{zsnprintf => snzprintf} (55%)
rename modules/{zsnprintf-gnu => snzprintf-gnu} (86%)
create mode 100644 modules/snzprintf-gnu-tests
rename modules/{zsnprintf-posix => snzprintf-posix} (71%)
create mode 100644 modules/snzprintf-posix-tests
rename modules/{zsprintf => szprintf} (53%)
rename modules/{zsprintf-gnu => szprintf-gnu} (87%)
create mode 100644 modules/szprintf-gnu-tests
rename modules/{zsprintf-posix => szprintf-posix} (71%)
create mode 100644 modules/szprintf-posix-tests
rename modules/{vazsprintf => vaszprintf} (52%)
rename modules/{vazsprintf-gnu => vaszprintf-gnu} (81%)
create mode 100644 modules/vaszprintf-gnu-tests
rename modules/{vazsprintf-posix => vaszprintf-posix} (81%)
create mode 100644 modules/vaszprintf-posix-tests
delete mode 100644 modules/vazsprintf-gnu-tests
delete mode 100644 modules/vazsprintf-posix-tests
rename modules/{vzsnprintf => vsnzprintf} (58%)
rename modules/{vzsnprintf-gnu => vsnzprintf-gnu} (86%)
create mode 100644 modules/vsnzprintf-gnu-tests
rename modules/{vzsnprintf-posix => vsnzprintf-posix} (71%)
create mode 100644 modules/vsnzprintf-posix-tests
rename modules/{vzsprintf => vszprintf} (57%)
rename modules/{vzsprintf-gnu => vszprintf-gnu} (86%)
create mode 100644 modules/vszprintf-gnu-tests
rename modules/{vzsprintf-posix => vszprintf-posix} (70%)
create mode 100644 modules/vszprintf-posix-tests
delete mode 100644 modules/vzsnprintf-gnu-tests
delete mode 100644 modules/vzsnprintf-posix-tests
delete mode 100644 modules/vzsprintf-gnu-tests
delete mode 100644 modules/vzsprintf-posix-tests
delete mode 100644 modules/zsnprintf-gnu-tests
delete mode 100644 modules/zsnprintf-posix-tests
delete mode 100644 modules/zsprintf-gnu-tests
delete mode 100644 modules/zsprintf-posix-tests
rename tests/{test-c-zsnprintf-gnu.c => test-c-snzprintf-gnu.c} (89%)
rename tests/{test-c-zsnprintf-gnu.sh => test-c-snzprintf-gnu.sh} (88%)
rename tests/{test-c-vazsprintf-gnu.c => test-c-vaszprintf-gnu.c} (78%)
rename tests/{test-c-vazsprintf-gnu.sh => test-c-vaszprintf-gnu.sh} (87%)
rename tests/{test-c-vzsnprintf-gnu.c => test-c-vsnzprintf-gnu.c} (83%)
rename tests/{test-c-vzsnprintf-gnu.sh => test-c-vsnzprintf-gnu.sh} (87%)
rename tests/{test-zsnprintf-gnu.c => test-snzprintf-gnu.c} (88%)
rename tests/{test-zsnprintf-gnu.h => test-snzprintf-gnu.h} (87%)
rename tests/{test-zsnprintf-posix.c => test-snzprintf-posix.c} (89%)
rename tests/{test-zsnprintf-posix.h => test-snzprintf-posix.h} (86%)
rename tests/{test-zsprintf-gnu.c => test-szprintf-gnu.c} (89%)
rename tests/{test-zsprintf-gnu.h => test-szprintf-gnu.h} (87%)
rename tests/{test-zsprintf-posix.c => test-szprintf-posix.c} (89%)
rename tests/{test-zsprintf-posix.h => test-szprintf-posix.h} (86%)
rename tests/{test-vazsprintf-gnu.c => test-vaszprintf-gnu.c} (79%)
rename tests/{test-vazsprintf-gnu.h => test-vaszprintf-gnu.h} (86%)
rename tests/{test-vazsprintf-posix.c => test-vaszprintf-posix.c} (85%)
rename tests/{test-vzsnprintf-gnu.c => test-vsnzprintf-gnu.c} (82%)
rename tests/{test-vzsnprintf-posix.c => test-vsnzprintf-posix.c} (82%)
rename tests/{test-vzsprintf-gnu.c => test-vszprintf-gnu.c} (83%)
rename tests/{test-vzsprintf-posix.c => test-vszprintf-posix.c} (84%)
diff --git a/ChangeLog b/ChangeLog
index 30424d8fbc..196de4813f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,96 @@
+2024-06-29 Bruno Haible <br...@clisp.org>
+
+ Global rename *zs[n]printf -> *s[n]zprintf.
+ * lib/aszprintf.c: Renamed from lib/azsprintf.c.
+ * lib/c-aszprintf.c: Renamed from lib/c-azsprintf.c.
+ * lib/c-vaszprintf.c: Renamed from lib/c-vazsprintf.c.
+ * lib/c-vsnzprintf.c: Renamed from lib/c-vzsnprintf.c.
+ * lib/c-snzprintf.c: Renamed from lib/c-zsnprintf.c.
+ * lib/vaszprintf.c: Renamed from lib/vazsprintf.c.
+ * lib/vsnzprintf.c: Renamed from lib/vzsnprintf.c.
+ * lib/vszprintf.c: Renamed from lib/vzsprintf.c.
+ * lib/snzprintf.c: Renamed from lib/zsnprintf.c.
+ * lib/szprintf.c: Renamed from lib/zsprintf.c.
+ * tests/test-c-vaszprintf-gnu.c: Renamed from
+ tests/test-c-vazsprintf-gnu.c.
+ * tests/test-c-vaszprintf-gnu.sh: Renamed from
+ tests/test-c-vazsprintf-gnu.sh.
+ * tests/test-c-vsnzprintf-gnu.c: Renamed from
+ tests/test-c-vzsnprintf-gnu.c.
+ * tests/test-c-vsnzprintf-gnu.sh: Renamed from
+ tests/test-c-vzsnprintf-gnu.sh.
+ * tests/test-c-snzprintf-gnu.c: Renamed from
+ tests/test-c-zsnprintf-gnu.c.
+ * tests/test-c-snzprintf-gnu.sh: Renamed from
+ tests/test-c-zsnprintf-gnu.sh.
+ * tests/test-vaszprintf-gnu.c: Renamed from tests/test-vazsprintf-gnu.c.
+ * tests/test-vaszprintf-gnu.h: Renamed from tests/test-vazsprintf-gnu.h.
+ * tests/test-vaszprintf-posix.c: Renamed from
+ tests/test-vazsprintf-posix.c.
+ * tests/test-vsnzprintf-gnu.c: Renamed from tests/test-vzsnprintf-gnu.c.
+ * tests/test-vsnzprintf-posix.c: Renamed from
+ tests/test-vzsnprintf-posix.c.
+ * tests/test-vszprintf-gnu.c: Renamed from tests/test-vzsprintf-gnu.c.
+ * tests/test-vszprintf-posix.c: Renamed from
+ tests/test-vzsprintf-posix.c.
+ * tests/test-snzprintf-gnu.c: Renamed from tests/test-zsnprintf-gnu.c.
+ * tests/test-snzprintf-gnu.h: Renamed from tests/test-zsnprintf-gnu.h.
+ * tests/test-snzprintf-posix.c: Renamed from
+ tests/test-zsnprintf-posix.c.
+ * tests/test-snzprintf-posix.h: Renamed from
+ tests/test-zsnprintf-posix.h.
+ * tests/test-szprintf-gnu.c: Renamed from tests/test-zsprintf-gnu.c.
+ * tests/test-szprintf-gnu.h: Renamed from tests/test-zsprintf-gnu.h.
+ * tests/test-szprintf-posix.c: Renamed from tests/test-zsprintf-posix.c.
+ * tests/test-szprintf-posix.h: Renamed from tests/test-zsprintf-posix.h.
+ * modules/c-vaszprintf: Renamed from modules/c-vazsprintf.
+ * modules/c-vaszprintf-gnu: Renamed from modules/c-vazsprintf-gnu.
+ * modules/c-vaszprintf-gnu-tests: Renamed from
+ modules/c-vazsprintf-gnu-tests.
+ * modules/c-vsnzprintf: Renamed from modules/c-vzsnprintf.
+ * modules/c-vsnzprintf-gnu: Renamed from modules/c-vzsnprintf-gnu.
+ * modules/c-vsnzprintf-gnu-tests: Renamed from
+ modules/c-vzsnprintf-gnu-tests.
+ * modules/c-snzprintf: Renamed from modules/c-zsnprintf.
+ * modules/c-snzprintf-gnu: Renamed from modules/c-zsnprintf-gnu.
+ * modules/c-snzprintf-gnu-tests: Renamed from
+ modules/c-zsnprintf-gnu-tests.
+ * modules/vaszprintf: Renamed from modules/vazsprintf.
+ * modules/vaszprintf-gnu: Renamed from modules/vazsprintf-gnu.
+ * modules/vaszprintf-gnu-tests: Renamed from
+ modules/vazsprintf-gnu-tests.
+ * modules/vaszprintf-posix: Renamed from modules/vazsprintf-posix.
+ * modules/vaszprintf-posix-tests: Renamed from
+ modules/vazsprintf-posix-tests.
+ * modules/vsnzprintf: Renamed from modules/vzsnprintf.
+ * modules/vsnzprintf-gnu: Renamed from modules/vzsnprintf-gnu.
+ * modules/vsnzprintf-gnu-tests: Renamed from
+ modules/vzsnprintf-gnu-tests.
+ * modules/vsnzprintf-posix: Renamed from modules/vzsnprintf-posix.
+ * modules/vsnzprintf-posix-tests: Renamed from
+ modules/vzsnprintf-posix-tests.
+ * modules/vszprintf: Renamed from modules/vzsprintf.
+ * modules/vszprintf-gnu: Renamed from modules/vzsprintf-gnu.
+ * modules/vszprintf-gnu-tests: Renamed from modules/vzsprintf-gnu-tests.
+ * modules/vszprintf-posix: Renamed from modules/vzsprintf-posix.
+ * modules/vszprintf-posix-tests: Renamed from
+ modules/vzsprintf-posix-tests.
+ * modules/snzprintf: Renamed from modules/zsnprintf.
+ * modules/snzprintf-gnu: Renamed from modules/zsnprintf-gnu.
+ * modules/snzprintf-gnu-tests: Renamed from modules/zsnprintf-gnu-tests.
+ * modules/snzprintf-posix: Renamed from modules/zsnprintf-posix.
+ * modules/snzprintf-posix-tests: Renamed from
+ modules/zsnprintf-posix-tests.
+ * modules/szprintf: Renamed from modules/zsprintf.
+ * modules/szprintf-gnu: Renamed from modules/zsprintf-gnu.
+ * modules/szprintf-gnu-tests: Renamed from modules/zsprintf-gnu-tests.
+ * modules/szprintf-posix: Renamed from modules/zsprintf-posix.
+ * modules/szprintf-posix-tests: Renamed from
+ modules/zsprintf-posix-tests.
+ All function names updated.
+ * lib/stdio.in.h, m4/stdio_h.m4, modules/stdio: Update module indicator
+ names.
+
2024-06-29 Bruno Haible <br...@clisp.org>
tests: Avoid test failures due to VirtualBox specific bug.
diff --git a/lib/azsprintf.c b/lib/aszprintf.c
similarity index 90%
rename from lib/azsprintf.c
rename to lib/aszprintf.c
index 9489854cb9..206bf743ea 100644
--- a/lib/azsprintf.c
+++ b/lib/aszprintf.c
@@ -22,13 +22,13 @@
#include <stdarg.h>
ptrdiff_t
-azsprintf (char **resultp, const char *format, ...)
+aszprintf (char **resultp, const char *format, ...)
{
va_list args;
ptrdiff_t result;
va_start (args, format);
- result = vazsprintf (resultp, format, args);
+ result = vaszprintf (resultp, format, args);
va_end (args);
return result;
}
diff --git a/lib/c-azsprintf.c b/lib/c-aszprintf.c
similarity index 90%
rename from lib/c-azsprintf.c
rename to lib/c-aszprintf.c
index 78bc973ef5..59d10725ff 100644
--- a/lib/c-azsprintf.c
+++ b/lib/c-aszprintf.c
@@ -22,13 +22,13 @@
#include <stdarg.h>
ptrdiff_t
-c_azsprintf (char **resultp, const char *format, ...)
+c_aszprintf (char **resultp, const char *format, ...)
{
va_list args;
ptrdiff_t result;
va_start (args, format);
- result = c_vazsprintf (resultp, format, args);
+ result = c_vaszprintf (resultp, format, args);
va_end (args);
return result;
}
diff --git a/lib/c-snprintf.c b/lib/c-snprintf.c
index 658f3faed4..f768213ba2 100644
--- a/lib/c-snprintf.c
+++ b/lib/c-snprintf.c
@@ -33,7 +33,7 @@ c_snprintf (char *str, size_t size, const char *format, ...)
ptrdiff_t ret;
va_start (args, format);
- ret = c_vzsnprintf (str, size, format, args);
+ ret = c_vsnzprintf (str, size, format, args);
va_end (args);
#if PTRDIFF_MAX > INT_MAX
diff --git a/lib/c-snprintf.h b/lib/c-snprintf.h
index f52e058e9e..8cd637d4dd 100644
--- a/lib/c-snprintf.h
+++ b/lib/c-snprintf.h
@@ -44,7 +44,7 @@ extern "C" {
Formatting takes place in the C locale, that is, the decimal point
used in floating-point formatting directives is always '.'. */
-extern ptrdiff_t c_zsnprintf (char *restrict str, size_t size,
+extern ptrdiff_t c_snzprintf (char *restrict str, size_t size,
const char *format, ...)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4));
diff --git a/lib/c-zsnprintf.c b/lib/c-snzprintf.c
similarity index 96%
rename from lib/c-zsnprintf.c
rename to lib/c-snzprintf.c
index 85ed3f9191..c674af9814 100644
--- a/lib/c-zsnprintf.c
+++ b/lib/c-snzprintf.c
@@ -29,7 +29,7 @@
#include "c-vasnprintf.h"
ptrdiff_t
-c_zsnprintf (char *str, size_t size, const char *format, ...)
+c_snzprintf (char *str, size_t size, const char *format, ...)
{
char *output;
size_t len;
diff --git a/lib/c-vasprintf.h b/lib/c-vasprintf.h
index bcd40bd5e0..048ecf0f62 100644
--- a/lib/c-vasprintf.h
+++ b/lib/c-vasprintf.h
@@ -47,9 +47,9 @@ extern "C" {
Formatting takes place in the C locale, that is, the decimal point
used in floating-point formatting directives is always '.'. */
-ptrdiff_t c_azsprintf (char **resultp, const char *format, ...)
+ptrdiff_t c_aszprintf (char **resultp, const char *format, ...)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 2, 3));
-ptrdiff_t c_vazsprintf (char **resultp, const char *format, va_list args)
+ptrdiff_t c_vaszprintf (char **resultp, const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 2, 0));
/* Prints formatted output to a string dynamically allocated with malloc().
diff --git a/lib/c-vazsprintf.c b/lib/c-vaszprintf.c
similarity index 95%
rename from lib/c-vazsprintf.c
rename to lib/c-vaszprintf.c
index 88ab938489..a5ef6864ab 100644
--- a/lib/c-vazsprintf.c
+++ b/lib/c-vaszprintf.c
@@ -26,7 +26,7 @@
#include "c-vasnprintf.h"
ptrdiff_t
-c_vazsprintf (char **resultp, const char *format, va_list args)
+c_vaszprintf (char **resultp, const char *format, va_list args)
{
size_t length;
char *result = c_vasnprintf (NULL, &length, format, args);
diff --git a/lib/c-vsnprintf.c b/lib/c-vsnprintf.c
index 941c2d4609..aee05c2be2 100644
--- a/lib/c-vsnprintf.c
+++ b/lib/c-vsnprintf.c
@@ -29,7 +29,7 @@
int
c_vsnprintf (char *str, size_t size, const char *format, va_list args)
{
- ptrdiff_t ret = c_vzsnprintf (str, size, format, args);
+ ptrdiff_t ret = c_vsnzprintf (str, size, format, args);
#if PTRDIFF_MAX > INT_MAX
if (ret > INT_MAX)
diff --git a/lib/c-vsnprintf.h b/lib/c-vsnprintf.h
index ff9cc2250c..2615118335 100644
--- a/lib/c-vsnprintf.h
+++ b/lib/c-vsnprintf.h
@@ -47,7 +47,7 @@ extern "C" {
Formatting takes place in the C locale, that is, the decimal point
used in floating-point formatting directives is always '.'. */
-extern ptrdiff_t c_vzsnprintf (char *restrict str, size_t size,
+extern ptrdiff_t c_vsnzprintf (char *restrict str, size_t size,
const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 0));
diff --git a/lib/c-vzsnprintf.c b/lib/c-vsnzprintf.c
similarity index 96%
rename from lib/c-vzsnprintf.c
rename to lib/c-vsnzprintf.c
index 948266dd99..28f7e4fa85 100644
--- a/lib/c-vzsnprintf.c
+++ b/lib/c-vsnzprintf.c
@@ -32,7 +32,7 @@
#include "c-vasnprintf.h"
ptrdiff_t
-c_vzsnprintf (char *str, size_t size, const char *format, va_list args)
+c_vsnzprintf (char *str, size_t size, const char *format, va_list args)
{
char *output;
size_t len;
diff --git a/lib/c-xvasprintf.c b/lib/c-xvasprintf.c
index b058bde4c5..f4c77d4a00 100644
--- a/lib/c-xvasprintf.c
+++ b/lib/c-xvasprintf.c
@@ -32,7 +32,7 @@ c_xvasprintf (const char *format, va_list args)
{
char *result;
- if (c_vazsprintf (&result, format, args) < 0)
+ if (c_vaszprintf (&result, format, args) < 0)
{
if (errno == ENOMEM)
xalloc_die ();
diff --git a/lib/snprintf.c b/lib/snprintf.c
index 80f69225ac..b82f782a9d 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -31,7 +31,7 @@ snprintf (char *str, size_t size, const char *format, ...)
ptrdiff_t ret;
va_start (args, format);
- ret = vzsnprintf (str, size, format, args);
+ ret = vsnzprintf (str, size, format, args);
va_end (args);
#if PTRDIFF_MAX > INT_MAX
diff --git a/lib/zsnprintf.c b/lib/snzprintf.c
similarity index 96%
rename from lib/zsnprintf.c
rename to lib/snzprintf.c
index 894631d16a..b786914a1c 100644
--- a/lib/zsnprintf.c
+++ b/lib/snzprintf.c
@@ -29,7 +29,7 @@
#include "vasnprintf.h"
ptrdiff_t
-zsnprintf (char *str, size_t size, const char *format, ...)
+snzprintf (char *str, size_t size, const char *format, ...)
{
char *output;
size_t len;
diff --git a/lib/sprintf.c b/lib/sprintf.c
index d781b8c7b5..fb861b87e6 100644
--- a/lib/sprintf.c
+++ b/lib/sprintf.c
@@ -33,7 +33,7 @@ sprintf (char *str, const char *format, ...)
ptrdiff_t ret;
va_start (args, format);
- ret = vzsprintf (str, format, args);
+ ret = vszprintf (str, format, args);
va_end (args);
#if PTRDIFF_MAX > INT_MAX
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index cf2d8c999b..bcae688b78 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -1459,7 +1459,7 @@ _GL_CXXALIASWARN (scanf);
# endif
#endif
-#if @GNULIB_ZSNPRINTF@
+#if @GNULIB_SNZPRINTF@
/* Prints formatted output to string STR. Similar to sprintf, but the
additional parameter SIZE limits how much is written into STR.
STR may be NULL, in which case nothing will be written.
@@ -1468,12 +1468,12 @@ _GL_CXXALIASWARN (scanf);
Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
Therefore, if the format string is valid and does not use %ls/%lc
directives nor widths, the only possible failure code is ENOMEM. */
-_GL_FUNCDECL_SYS (zsnprintf, ptrdiff_t,
+_GL_FUNCDECL_SYS (snzprintf, ptrdiff_t,
(char *restrict str, size_t size,
const char *restrict format, ...)
_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4)
_GL_ARG_NONNULL ((3)));
-_GL_CXXALIAS_SYS (zsnprintf, ptrdiff_t,
+_GL_CXXALIAS_SYS (snzprintf, ptrdiff_t,
(char *restrict str, size_t size,
const char *restrict format, ...));
#endif
@@ -1520,19 +1520,19 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
# endif
#endif
-#if @GNULIB_ZSPRINTF@
+#if @GNULIB_SZPRINTF@
/* Prints formatted output to string STR.
Returns the string length of the formatted string. Upon failure,
returns -1 with errno set.
Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
Therefore, if the format string is valid and does not use %ls/%lc
directives nor widths, the only possible failure code is ENOMEM. */
-_GL_FUNCDECL_SYS (zsprintf, ptrdiff_t,
+_GL_FUNCDECL_SYS (szprintf, ptrdiff_t,
(char *restrict str,
const char *restrict format, ...)
_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
_GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_SYS (zsprintf, ptrdiff_t,
+_GL_CXXALIAS_SYS (szprintf, ptrdiff_t,
(char *restrict str,
const char *restrict format, ...));
#endif
@@ -1629,7 +1629,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - "
# endif
#endif
-#if @GNULIB_VAZSPRINTF@
+#if @GNULIB_VASZPRINTF@
/* Prints formatted output to a string dynamically allocated with malloc().
If the memory allocation succeeds, it stores the address of the string in
*RESULT and returns the number of resulting bytes, excluding the trailing
@@ -1638,17 +1638,17 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - "
Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
Therefore, if the format string is valid and does not use %ls/%lc
directives nor widths, the only possible failure code is ENOMEM. */
-_GL_FUNCDECL_SYS (azsprintf, ptrdiff_t,
+_GL_FUNCDECL_SYS (aszprintf, ptrdiff_t,
(char **result, const char *format, ...)
_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
_GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_SYS (azsprintf, ptrdiff_t,
+_GL_CXXALIAS_SYS (aszprintf, ptrdiff_t,
(char **result, const char *format, ...));
-_GL_FUNCDECL_SYS (vazsprintf, ptrdiff_t,
+_GL_FUNCDECL_SYS (vaszprintf, ptrdiff_t,
(char **result, const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
_GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_SYS (vazsprintf, ptrdiff_t,
+_GL_CXXALIAS_SYS (vaszprintf, ptrdiff_t,
(char **result, const char *format, va_list args));
#endif
@@ -1862,7 +1862,7 @@ _GL_CXXALIASWARN (vscanf);
# endif
#endif
-#if @GNULIB_VZSNPRINTF@
+#if @GNULIB_VSNZPRINTF@
/* Prints formatted output to string STR. Similar to sprintf, but the
additional parameter SIZE limits how much is written into STR.
STR may be NULL, in which case nothing will be written.
@@ -1871,12 +1871,12 @@ _GL_CXXALIASWARN (vscanf);
Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
Therefore, if the format string is valid and does not use %ls/%lc
directives nor widths, the only possible failure code is ENOMEM. */
-_GL_FUNCDECL_SYS (vzsnprintf, ptrdiff_t,
+_GL_FUNCDECL_SYS (vsnzprintf, ptrdiff_t,
(char *restrict str, size_t size,
const char *restrict format, va_list args)
_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0)
_GL_ARG_NONNULL ((3)));
-_GL_CXXALIAS_SYS (vzsnprintf, ptrdiff_t,
+_GL_CXXALIAS_SYS (vsnzprintf, ptrdiff_t,
(char *restrict str, size_t size,
const char *restrict format, va_list args));
#endif
@@ -1923,19 +1923,19 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - "
# endif
#endif
-#if @GNULIB_VZSPRINTF@
+#if @GNULIB_VSZPRINTF@
/* Prints formatted output to string STR.
Returns the string length of the formatted string. Upon failure,
returns -1 with errno set.
Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
Therefore, if the format string is valid and does not use %ls/%lc
directives nor widths, the only possible failure code is ENOMEM. */
-_GL_FUNCDECL_SYS (vzsprintf, ptrdiff_t,
+_GL_FUNCDECL_SYS (vszprintf, ptrdiff_t,
(char *restrict str,
const char *restrict format, va_list args)
_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
_GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_SYS (vzsprintf, ptrdiff_t,
+_GL_CXXALIAS_SYS (vszprintf, ptrdiff_t,
(char *restrict str,
const char *restrict format, va_list args));
#endif
diff --git a/lib/zsprintf.c b/lib/szprintf.c
similarity index 97%
rename from lib/zsprintf.c
rename to lib/szprintf.c
index f004ed7238..c5f07dec25 100644
--- a/lib/zsprintf.c
+++ b/lib/szprintf.c
@@ -29,7 +29,7 @@
#include "vasnprintf.h"
ptrdiff_t
-zsprintf (char *str, const char *format, ...)
+szprintf (char *str, const char *format, ...)
{
char *output;
size_t len;
diff --git a/lib/vazsprintf.c b/lib/vaszprintf.c
similarity index 95%
rename from lib/vazsprintf.c
rename to lib/vaszprintf.c
index 73002a17d5..7589fbe607 100644
--- a/lib/vazsprintf.c
+++ b/lib/vaszprintf.c
@@ -26,7 +26,7 @@
#include "vasnprintf.h"
ptrdiff_t
-vazsprintf (char **resultp, const char *format, va_list args)
+vaszprintf (char **resultp, const char *format, va_list args)
{
size_t length;
char *result = vasnprintf (NULL, &length, format, args);
diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c
index 1954dcea26..cfcee78b86 100644
--- a/lib/vsnprintf.c
+++ b/lib/vsnprintf.c
@@ -29,7 +29,7 @@
int
vsnprintf (char *str, size_t size, const char *format, va_list args)
{
- ptrdiff_t ret = vzsnprintf (str, size, format, args);
+ ptrdiff_t ret = vsnzprintf (str, size, format, args);
#if PTRDIFF_MAX > INT_MAX
if (ret > INT_MAX)
diff --git a/lib/vzsnprintf.c b/lib/vsnzprintf.c
similarity index 96%
rename from lib/vzsnprintf.c
rename to lib/vsnzprintf.c
index 96e240bdb7..f598526c80 100644
--- a/lib/vzsnprintf.c
+++ b/lib/vsnzprintf.c
@@ -31,7 +31,7 @@
#include "vasnprintf.h"
ptrdiff_t
-vzsnprintf (char *str, size_t size, const char *format, va_list args)
+vsnzprintf (char *str, size_t size, const char *format, va_list args)
{
char *output;
size_t len;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 065ed74222..ec7c8da4f8 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -29,7 +29,7 @@
int
vsprintf (char *str, const char *format, va_list args)
{
- ptrdiff_t ret = vzsprintf (str, format, args);
+ ptrdiff_t ret = vszprintf (str, format, args);
#if PTRDIFF_MAX > INT_MAX
if (ret > INT_MAX)
diff --git a/lib/vzsprintf.c b/lib/vszprintf.c
similarity index 96%
rename from lib/vzsprintf.c
rename to lib/vszprintf.c
index 549543070c..f980d1ec3e 100644
--- a/lib/vzsprintf.c
+++ b/lib/vszprintf.c
@@ -29,7 +29,7 @@
#include "vasnprintf.h"
ptrdiff_t
-vzsprintf (char *str, const char *format, va_list args)
+vszprintf (char *str, const char *format, va_list args)
{
char *output;
size_t len;
diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c
index 97f24eb297..6aba32c09a 100644
--- a/lib/xvasprintf.c
+++ b/lib/xvasprintf.c
@@ -96,7 +96,7 @@ xvasprintf (const char *format, va_list args)
}
}
- if (vazsprintf (&result, format, args) < 0)
+ if (vaszprintf (&result, format, args) < 0)
{
if (errno == ENOMEM)
xalloc_die ();
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index 10e1fbb8aa..f3edc43ccd 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -178,7 +178,7 @@ AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS]
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF])
- gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VAZSPRINTF])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASZPRINTF])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF])
@@ -188,10 +188,10 @@ AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS]
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX])
- gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VZSNPRINTF])
- gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VZSPRINTF])
- gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ZSNPRINTF])
- gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ZSPRINTF])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNZPRINTF])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSZPRINTF])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNZPRINTF])
+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SZPRINTF])
dnl Support Microsoft deprecated alias function names by default.
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1])
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1])
diff --git a/modules/c-snprintf b/modules/c-snprintf
index 49857beca7..19a054dcbe 100644
--- a/modules/c-snprintf
+++ b/modules/c-snprintf
@@ -8,7 +8,7 @@ lib/c-snprintf.c
Depends-on:
stdint
stdio
-c-vzsnprintf
+c-vsnzprintf
configure.ac:
AC_REQUIRE([AC_C_RESTRICT])
diff --git a/modules/c-zsnprintf b/modules/c-snzprintf
similarity index 67%
rename from modules/c-zsnprintf
rename to modules/c-snzprintf
index 5410db03cd..83c2cd83a7 100644
--- a/modules/c-zsnprintf
+++ b/modules/c-snzprintf
@@ -1,10 +1,10 @@
Description:
-c_zsnprintf(): print formatted output to a fixed length string (without
+c_snzprintf(): print formatted output to a fixed length string (without
INT_MAX limitation) in C locale
Files:
lib/c-snprintf.h
-lib/c-zsnprintf.c
+lib/c-snzprintf.c
Depends-on:
stdint
@@ -15,7 +15,7 @@ configure.ac:
AC_REQUIRE([AC_C_RESTRICT])
Makefile.am:
-lib_SOURCES += c-zsnprintf.c
+lib_SOURCES += c-snzprintf.c
Include:
"c-snprintf.h"
diff --git a/modules/c-zsnprintf-gnu b/modules/c-snzprintf-gnu
similarity index 87%
rename from modules/c-zsnprintf-gnu
rename to modules/c-snzprintf-gnu
index 1955098d4a..ff4d2c599d 100644
--- a/modules/c-zsnprintf-gnu
+++ b/modules/c-snzprintf-gnu
@@ -1,11 +1,11 @@
Description:
-c_zsnprintf() function
+c_snzprintf() function
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-c-zsnprintf
+c-snzprintf
mixin/printf-gnu
configure.ac:
diff --git a/modules/c-snzprintf-gnu-tests b/modules/c-snzprintf-gnu-tests
new file mode 100644
index 0000000000..ce574fc3a2
--- /dev/null
+++ b/modules/c-snzprintf-gnu-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-c-snzprintf-gnu.c
+tests/test-snzprintf-gnu.h
+tests/test-c-snzprintf-gnu.sh
+tests/macros.h
+m4/locale-fr.m4
+m4/codeset.m4
+
+Depends-on:
+setlocale
+
+configure.ac:
+gt_LOCALE_FR
+
+Makefile.am:
+TESTS += test-c-snzprintf-gnu.sh
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+check_PROGRAMS += test-c-snzprintf-gnu
+test_c_snzprintf_gnu_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-vazsprintf b/modules/c-vaszprintf
similarity index 57%
rename from modules/c-vazsprintf
rename to modules/c-vaszprintf
index 5cea385926..da7df0d7be 100644
--- a/modules/c-vazsprintf
+++ b/modules/c-vaszprintf
@@ -1,10 +1,10 @@
Description:
-azsprintf() and vazsprintf() in C locale
+aszprintf() and vaszprintf() in C locale
Files:
lib/c-vasprintf.h
-lib/c-azsprintf.c
-lib/c-vazsprintf.c
+lib/c-aszprintf.c
+lib/c-vaszprintf.c
Depends-on:
stdint
@@ -14,7 +14,7 @@ c-vasnprintf
configure.ac:
Makefile.am:
-lib_SOURCES += c-azsprintf.c c-vazsprintf.c
+lib_SOURCES += c-aszprintf.c c-vaszprintf.c
Include:
"c-vasprintf.h"
diff --git a/modules/c-vazsprintf-gnu b/modules/c-vaszprintf-gnu
similarity index 81%
rename from modules/c-vazsprintf-gnu
rename to modules/c-vaszprintf-gnu
index 46690f4ddb..acee07d3b8 100644
--- a/modules/c-vazsprintf-gnu
+++ b/modules/c-vaszprintf-gnu
@@ -1,11 +1,11 @@
Description:
-c_azsprintf() and c_vazsprintf() functions
+c_aszprintf() and c_vaszprintf() functions
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-c-vazsprintf
+c-vaszprintf
mixin/printf-gnu
configure.ac:
diff --git a/modules/c-vaszprintf-gnu-tests b/modules/c-vaszprintf-gnu-tests
new file mode 100644
index 0000000000..56565cda42
--- /dev/null
+++ b/modules/c-vaszprintf-gnu-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-c-vaszprintf-gnu.c
+tests/test-vaszprintf-gnu.h
+tests/test-c-vaszprintf-gnu.sh
+tests/macros.h
+m4/locale-fr.m4
+m4/codeset.m4
+
+Depends-on:
+setlocale
+
+configure.ac:
+gt_LOCALE_FR
+
+Makefile.am:
+TESTS += test-c-vaszprintf-gnu.sh
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+check_PROGRAMS += test-c-vaszprintf-gnu
+test_c_vaszprintf_gnu_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-vazsprintf-gnu-tests b/modules/c-vazsprintf-gnu-tests
deleted file mode 100644
index a7c5762b9c..0000000000
--- a/modules/c-vazsprintf-gnu-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-c-vazsprintf-gnu.c
-tests/test-vazsprintf-gnu.h
-tests/test-c-vazsprintf-gnu.sh
-tests/macros.h
-m4/locale-fr.m4
-m4/codeset.m4
-
-Depends-on:
-setlocale
-
-configure.ac:
-gt_LOCALE_FR
-
-Makefile.am:
-TESTS += test-c-vazsprintf-gnu.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
-check_PROGRAMS += test-c-vazsprintf-gnu
-test_c_vazsprintf_gnu_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-vsnprintf b/modules/c-vsnprintf
index 835968f96a..9ba2b3657a 100644
--- a/modules/c-vsnprintf
+++ b/modules/c-vsnprintf
@@ -9,7 +9,7 @@ lib/c-vsnprintf.c
Depends-on:
stdint
stdio
-c-vzsnprintf
+c-vsnzprintf
configure.ac:
AC_REQUIRE([AC_C_RESTRICT])
diff --git a/modules/c-vzsnprintf b/modules/c-vsnzprintf
similarity index 70%
rename from modules/c-vzsnprintf
rename to modules/c-vsnzprintf
index 4049974f4a..9d56f9cdbe 100644
--- a/modules/c-vzsnprintf
+++ b/modules/c-vsnzprintf
@@ -1,10 +1,10 @@
Description:
-c_vzsnprintf(): print formatted output from an stdarg argument list to a
+c_vsnzprintf(): print formatted output from an stdarg argument list to a
fixed length string (without INT_MAX limitation) in C locale
Files:
lib/c-vsnprintf.h
-lib/c-vzsnprintf.c
+lib/c-vsnzprintf.c
Depends-on:
stdint
@@ -15,7 +15,7 @@ configure.ac:
AC_REQUIRE([AC_C_RESTRICT])
Makefile.am:
-lib_SOURCES += c-vzsnprintf.c
+lib_SOURCES += c-vsnzprintf.c
Include:
"c-vsnprintf.h"
diff --git a/modules/c-vzsnprintf-gnu b/modules/c-vsnzprintf-gnu
similarity index 86%
rename from modules/c-vzsnprintf-gnu
rename to modules/c-vsnzprintf-gnu
index 9a02c1d847..0bebe833ca 100644
--- a/modules/c-vzsnprintf-gnu
+++ b/modules/c-vsnzprintf-gnu
@@ -1,11 +1,11 @@
Description:
-c_vzsnprintf() function
+c_vsnzprintf() function
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-c-vzsnprintf
+c-vsnzprintf
mixin/printf-gnu
configure.ac:
diff --git a/modules/c-vsnzprintf-gnu-tests b/modules/c-vsnzprintf-gnu-tests
new file mode 100644
index 0000000000..c731225056
--- /dev/null
+++ b/modules/c-vsnzprintf-gnu-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-c-vsnzprintf-gnu.c
+tests/test-snzprintf-gnu.h
+tests/test-c-vsnzprintf-gnu.sh
+tests/macros.h
+m4/locale-fr.m4
+m4/codeset.m4
+
+Depends-on:
+setlocale
+
+configure.ac:
+gt_LOCALE_FR
+
+Makefile.am:
+TESTS += test-c-vsnzprintf-gnu.sh
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
+check_PROGRAMS += test-c-vsnzprintf-gnu
+test_c_vsnzprintf_gnu_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-vzsnprintf-gnu-tests b/modules/c-vzsnprintf-gnu-tests
deleted file mode 100644
index 044c5f25ec..0000000000
--- a/modules/c-vzsnprintf-gnu-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-c-vzsnprintf-gnu.c
-tests/test-zsnprintf-gnu.h
-tests/test-c-vzsnprintf-gnu.sh
-tests/macros.h
-m4/locale-fr.m4
-m4/codeset.m4
-
-Depends-on:
-setlocale
-
-configure.ac:
-gt_LOCALE_FR
-
-Makefile.am:
-TESTS += test-c-vzsnprintf-gnu.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
-check_PROGRAMS += test-c-vzsnprintf-gnu
-test_c_vzsnprintf_gnu_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/c-xvasprintf b/modules/c-xvasprintf
index ccbc93d794..a46e418544 100644
--- a/modules/c-xvasprintf
+++ b/modules/c-xvasprintf
@@ -10,7 +10,7 @@ m4/strerrorname_np.m4
Depends-on:
extensions
stdio
-c-vazsprintf
+c-vaszprintf
xalloc-die
configure.ac:
diff --git a/modules/c-zsnprintf-gnu-tests b/modules/c-zsnprintf-gnu-tests
deleted file mode 100644
index 6ae7df356d..0000000000
--- a/modules/c-zsnprintf-gnu-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-c-zsnprintf-gnu.c
-tests/test-zsnprintf-gnu.h
-tests/test-c-zsnprintf-gnu.sh
-tests/macros.h
-m4/locale-fr.m4
-m4/codeset.m4
-
-Depends-on:
-setlocale
-
-configure.ac:
-gt_LOCALE_FR
-
-Makefile.am:
-TESTS += test-c-zsnprintf-gnu.sh
-TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@'
-check_PROGRAMS += test-c-zsnprintf-gnu
-test_c_zsnprintf_gnu_LDADD = $(LDADD) $(SETLOCALE_LIB)
diff --git a/modules/snprintf b/modules/snprintf
index cd4eb6b2c4..b44fc9a6ea 100644
--- a/modules/snprintf
+++ b/modules/snprintf
@@ -10,7 +10,7 @@ Depends-on:
stdio
errno [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
stdint [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
-vzsnprintf [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
+vsnzprintf [test $ac_cv_func_snprintf = no || test $REPLACE_SNPRINTF = 1]
configure.ac:
gl_FUNC_SNPRINTF
diff --git a/modules/zsnprintf b/modules/snzprintf
similarity index 55%
rename from modules/zsnprintf
rename to modules/snzprintf
index 40fd329e0e..9d81fc4ca1 100644
--- a/modules/zsnprintf
+++ b/modules/snzprintf
@@ -1,9 +1,9 @@
Description:
-zsnprintf() function: print formatted output to a fixed length string
+snzprintf() function: print formatted output to a fixed length string
(without INT_MAX limitation)
Files:
-lib/zsnprintf.c
+lib/snzprintf.c
Depends-on:
stdio
@@ -12,10 +12,10 @@ errno
stdint
configure.ac:
-gl_STDIO_MODULE_INDICATOR([zsnprintf])
+gl_STDIO_MODULE_INDICATOR([snzprintf])
Makefile.am:
-lib_SOURCES += zsnprintf.c
+lib_SOURCES += snzprintf.c
Include:
<stdio.h>
diff --git a/modules/zsnprintf-gnu b/modules/snzprintf-gnu
similarity index 86%
rename from modules/zsnprintf-gnu
rename to modules/snzprintf-gnu
index d0bd55792d..d2aa9e5359 100644
--- a/modules/zsnprintf-gnu
+++ b/modules/snzprintf-gnu
@@ -1,11 +1,11 @@
Description:
-zsnprintf() function
+snzprintf() function
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-zsnprintf-posix
+snzprintf-posix
mixin/printf-gnu
configure.ac:
diff --git a/modules/snzprintf-gnu-tests b/modules/snzprintf-gnu-tests
new file mode 100644
index 0000000000..662795cdff
--- /dev/null
+++ b/modules/snzprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-snzprintf-gnu.c
+tests/test-snzprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-snzprintf-gnu
+check_PROGRAMS += test-snzprintf-gnu
diff --git a/modules/zsnprintf-posix b/modules/snzprintf-posix
similarity index 71%
rename from modules/zsnprintf-posix
rename to modules/snzprintf-posix
index 6e2f2c6589..c181159ce9 100644
--- a/modules/zsnprintf-posix
+++ b/modules/snzprintf-posix
@@ -1,10 +1,10 @@
Description:
-zsnprintf() function with POSIX compliant format string interpretation
+snzprintf() function with POSIX compliant format string interpretation
Files:
Depends-on:
-zsnprintf
+snzprintf
mixin/printf-posix
configure.ac:
diff --git a/modules/snzprintf-posix-tests b/modules/snzprintf-posix-tests
new file mode 100644
index 0000000000..bafb886c07
--- /dev/null
+++ b/modules/snzprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-snzprintf-posix.c
+tests/test-snzprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-snzprintf-posix
+check_PROGRAMS += test-snzprintf-posix
diff --git a/modules/sprintf-posix b/modules/sprintf-posix
index 2c47424bec..682043847f 100644
--- a/modules/sprintf-posix
+++ b/modules/sprintf-posix
@@ -18,7 +18,7 @@ stdio
nocrash
printf-safe
multiarch
-vzsprintf [test $REPLACE_SPRINTF = 1]
+vszprintf [test $REPLACE_SPRINTF = 1]
mixin/printf-posix [test $REPLACE_SPRINTF = 1]
stdint [test $REPLACE_SPRINTF = 1]
errno [test $REPLACE_SPRINTF = 1]
diff --git a/modules/stdio b/modules/stdio
index 64fdc5fb60..319309828f 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -113,7 +113,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
-e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
-e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
-e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
- -e 's/@''GNULIB_VAZSPRINTF''@/$(GNULIB_VAZSPRINTF)/g' \
+ -e 's/@''GNULIB_VASZPRINTF''@/$(GNULIB_VASZPRINTF)/g' \
-e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
-e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
-e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
@@ -123,10 +123,10 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
-e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
-e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
-e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
- -e 's/@''GNULIB_VZSNPRINTF''@/$(GNULIB_VZSNPRINTF)/g' \
- -e 's/@''GNULIB_VZSPRINTF''@/$(GNULIB_VZSPRINTF)/g' \
- -e 's/@''GNULIB_ZSNPRINTF''@/$(GNULIB_ZSNPRINTF)/g' \
- -e 's/@''GNULIB_ZSPRINTF''@/$(GNULIB_ZSPRINTF)/g' \
+ -e 's/@''GNULIB_VSNZPRINTF''@/$(GNULIB_VSNZPRINTF)/g' \
+ -e 's/@''GNULIB_VSZPRINTF''@/$(GNULIB_VSZPRINTF)/g' \
+ -e 's/@''GNULIB_SNZPRINTF''@/$(GNULIB_SNZPRINTF)/g' \
+ -e 's/@''GNULIB_SZPRINTF''@/$(GNULIB_SZPRINTF)/g' \
-e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \
-e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \
-e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \
diff --git a/modules/zsprintf b/modules/szprintf
similarity index 53%
rename from modules/zsprintf
rename to modules/szprintf
index 7da8687ea4..1e647c20b7 100644
--- a/modules/zsprintf
+++ b/modules/szprintf
@@ -1,9 +1,9 @@
Description:
-zsprintf() function: print formatted output to a string (without INT_MAX
+szprintf() function: print formatted output to a string (without INT_MAX
limitation)
Files:
-lib/zsprintf.c
+lib/szprintf.c
Depends-on:
stdio
@@ -12,10 +12,10 @@ errno
stdint
configure.ac:
-gl_STDIO_MODULE_INDICATOR([zsprintf])
+gl_STDIO_MODULE_INDICATOR([szprintf])
Makefile.am:
-lib_SOURCES += zsprintf.c
+lib_SOURCES += szprintf.c
Include:
<stdio.h>
diff --git a/modules/zsprintf-gnu b/modules/szprintf-gnu
similarity index 87%
rename from modules/zsprintf-gnu
rename to modules/szprintf-gnu
index a530b34303..4fcb993ec5 100644
--- a/modules/zsprintf-gnu
+++ b/modules/szprintf-gnu
@@ -1,11 +1,11 @@
Description:
-zsprintf() function
+szprintf() function
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-zsprintf-posix
+szprintf-posix
mixin/printf-gnu
configure.ac:
diff --git a/modules/szprintf-gnu-tests b/modules/szprintf-gnu-tests
new file mode 100644
index 0000000000..3910afb03c
--- /dev/null
+++ b/modules/szprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-szprintf-gnu.c
+tests/test-szprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-szprintf-gnu
+check_PROGRAMS += test-szprintf-gnu
diff --git a/modules/zsprintf-posix b/modules/szprintf-posix
similarity index 71%
rename from modules/zsprintf-posix
rename to modules/szprintf-posix
index c3ab891f88..67757628aa 100644
--- a/modules/zsprintf-posix
+++ b/modules/szprintf-posix
@@ -1,10 +1,10 @@
Description:
-zsprintf() function with POSIX compliant format string interpretation
+szprintf() function with POSIX compliant format string interpretation
Files:
Depends-on:
-zsprintf
+szprintf
mixin/printf-posix
configure.ac:
diff --git a/modules/szprintf-posix-tests b/modules/szprintf-posix-tests
new file mode 100644
index 0000000000..39a93998fe
--- /dev/null
+++ b/modules/szprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-szprintf-posix.c
+tests/test-szprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-szprintf-posix
+check_PROGRAMS += test-szprintf-posix
diff --git a/modules/vazsprintf b/modules/vaszprintf
similarity index 52%
rename from modules/vazsprintf
rename to modules/vaszprintf
index 787825aa71..a732581d93 100644
--- a/modules/vazsprintf
+++ b/modules/vaszprintf
@@ -2,8 +2,8 @@ Description:
vsprintf (without INT_MAX limitation) with automatic memory allocation
Files:
-lib/vazsprintf.c
-lib/azsprintf.c
+lib/vaszprintf.c
+lib/aszprintf.c
Depends-on:
stdio
@@ -12,13 +12,13 @@ errno
stdint
configure.ac:
-gl_STDIO_MODULE_INDICATOR([vazsprintf])
+gl_STDIO_MODULE_INDICATOR([vaszprintf])
m4_ifdef([AM_XGETTEXT_OPTION],
- [AM_][XGETTEXT_OPTION([--flag=azsprintf:2:c-format])
- AM_][XGETTEXT_OPTION([--flag=vazsprintf:2:c-format])])
+ [AM_][XGETTEXT_OPTION([--flag=aszprintf:2:c-format])
+ AM_][XGETTEXT_OPTION([--flag=vaszprintf:2:c-format])])
Makefile.am:
-lib_SOURCES += vazsprintf.c azsprintf.c
+lib_SOURCES += vaszprintf.c aszprintf.c
Include:
<stdio.h>
diff --git a/modules/vazsprintf-gnu b/modules/vaszprintf-gnu
similarity index 81%
rename from modules/vazsprintf-gnu
rename to modules/vaszprintf-gnu
index ce3c0e1788..c4cbf7caa7 100644
--- a/modules/vazsprintf-gnu
+++ b/modules/vaszprintf-gnu
@@ -1,11 +1,11 @@
Description:
-azsprintf() and vazsprintf() functions
+aszprintf() and vaszprintf() functions
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-vazsprintf-posix
+vaszprintf-posix
mixin/printf-gnu
configure.ac:
diff --git a/modules/vaszprintf-gnu-tests b/modules/vaszprintf-gnu-tests
new file mode 100644
index 0000000000..3076d19105
--- /dev/null
+++ b/modules/vaszprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-vaszprintf-gnu.c
+tests/test-vaszprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vaszprintf-gnu
+check_PROGRAMS += test-vaszprintf-gnu
diff --git a/modules/vazsprintf-posix b/modules/vaszprintf-posix
similarity index 81%
rename from modules/vazsprintf-posix
rename to modules/vaszprintf-posix
index 39a1da3800..add22fceac 100644
--- a/modules/vazsprintf-posix
+++ b/modules/vaszprintf-posix
@@ -1,11 +1,11 @@
Description:
-azsprintf() and vazsprintf() functions
+aszprintf() and vaszprintf() functions
with POSIX compliant format string interpretation
Files:
Depends-on:
-vazsprintf
+vaszprintf
mixin/printf-posix
configure.ac:
diff --git a/modules/vaszprintf-posix-tests b/modules/vaszprintf-posix-tests
new file mode 100644
index 0000000000..da83ebc5c3
--- /dev/null
+++ b/modules/vaszprintf-posix-tests
@@ -0,0 +1,13 @@
+Files:
+tests/test-vaszprintf-posix.c
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vaszprintf-posix
+check_PROGRAMS += test-vaszprintf-posix
diff --git a/modules/vazsprintf-gnu-tests b/modules/vazsprintf-gnu-tests
deleted file mode 100644
index 80de638ce8..0000000000
--- a/modules/vazsprintf-gnu-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-vazsprintf-gnu.c
-tests/test-vazsprintf-gnu.h
-tests/macros.h
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-vazsprintf-gnu
-check_PROGRAMS += test-vazsprintf-gnu
diff --git a/modules/vazsprintf-posix-tests b/modules/vazsprintf-posix-tests
deleted file mode 100644
index 04c84e7861..0000000000
--- a/modules/vazsprintf-posix-tests
+++ /dev/null
@@ -1,13 +0,0 @@
-Files:
-tests/test-vazsprintf-posix.c
-tests/infinity.h
-tests/macros.h
-
-Depends-on:
-nan
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-vazsprintf-posix
-check_PROGRAMS += test-vazsprintf-posix
diff --git a/modules/vsnprintf b/modules/vsnprintf
index de2a86e285..2c77dd4d61 100644
--- a/modules/vsnprintf
+++ b/modules/vsnprintf
@@ -11,7 +11,7 @@ Depends-on:
stdio
errno [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
stdint [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
-vzsnprintf [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
+vsnzprintf [test $ac_cv_func_vsnprintf = no || test $REPLACE_VSNPRINTF = 1]
configure.ac:
gl_FUNC_VSNPRINTF
diff --git a/modules/vzsnprintf b/modules/vsnzprintf
similarity index 58%
rename from modules/vzsnprintf
rename to modules/vsnzprintf
index 853d88210d..e6b060d41d 100644
--- a/modules/vzsnprintf
+++ b/modules/vsnzprintf
@@ -1,9 +1,9 @@
Description:
-vzsnprintf() function: print formatted output from an stdarg argument list
+vsnzprintf() function: print formatted output from an stdarg argument list
to a fixed length string (without INT_MAX limitation)
Files:
-lib/vzsnprintf.c
+lib/vsnzprintf.c
Depends-on:
stdio
@@ -12,10 +12,10 @@ errno
stdint
configure.ac:
-gl_STDIO_MODULE_INDICATOR([vzsnprintf])
+gl_STDIO_MODULE_INDICATOR([vsnzprintf])
Makefile.am:
-lib_SOURCES += vzsnprintf.c
+lib_SOURCES += vsnzprintf.c
Include:
<stdio.h>
diff --git a/modules/vzsnprintf-gnu b/modules/vsnzprintf-gnu
similarity index 86%
rename from modules/vzsnprintf-gnu
rename to modules/vsnzprintf-gnu
index 04c46a3cc3..54c8b7f244 100644
--- a/modules/vzsnprintf-gnu
+++ b/modules/vsnzprintf-gnu
@@ -1,11 +1,11 @@
Description:
-vzsnprintf() function
+vsnzprintf() function
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-vzsnprintf-posix
+vsnzprintf-posix
mixin/printf-gnu
configure.ac:
diff --git a/modules/vsnzprintf-gnu-tests b/modules/vsnzprintf-gnu-tests
new file mode 100644
index 0000000000..299ce4f1b0
--- /dev/null
+++ b/modules/vsnzprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-vsnzprintf-gnu.c
+tests/test-snzprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vsnzprintf-gnu
+check_PROGRAMS += test-vsnzprintf-gnu
diff --git a/modules/vzsnprintf-posix b/modules/vsnzprintf-posix
similarity index 71%
rename from modules/vzsnprintf-posix
rename to modules/vsnzprintf-posix
index e1d30cf54f..dac079c20f 100644
--- a/modules/vzsnprintf-posix
+++ b/modules/vsnzprintf-posix
@@ -1,10 +1,10 @@
Description:
-vzsnprintf() function with POSIX compliant format string interpretation
+vsnzprintf() function with POSIX compliant format string interpretation
Files:
Depends-on:
-vzsnprintf
+vsnzprintf
mixin/printf-posix
configure.ac:
diff --git a/modules/vsnzprintf-posix-tests b/modules/vsnzprintf-posix-tests
new file mode 100644
index 0000000000..3d4e214456
--- /dev/null
+++ b/modules/vsnzprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-vsnzprintf-posix.c
+tests/test-snzprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vsnzprintf-posix
+check_PROGRAMS += test-vsnzprintf-posix
diff --git a/modules/vsprintf-posix b/modules/vsprintf-posix
index 91b634921a..d1df5a39b9 100644
--- a/modules/vsprintf-posix
+++ b/modules/vsprintf-posix
@@ -18,7 +18,7 @@ stdio
nocrash
printf-safe
multiarch
-vzsprintf [test $REPLACE_VSPRINTF = 1]
+vszprintf [test $REPLACE_VSPRINTF = 1]
mixin/printf-posix [test $REPLACE_VSPRINTF = 1]
stdint [test $REPLACE_VSPRINTF = 1]
errno [test $REPLACE_VSPRINTF = 1]
diff --git a/modules/vzsprintf b/modules/vszprintf
similarity index 57%
rename from modules/vzsprintf
rename to modules/vszprintf
index 6564c020f1..1e74637574 100644
--- a/modules/vzsprintf
+++ b/modules/vszprintf
@@ -1,9 +1,9 @@
Description:
-vzsprintf() function: print formatted output from an stdarg argument list
+vszprintf() function: print formatted output from an stdarg argument list
to a string (without INT_MAX limitation)
Files:
-lib/vzsprintf.c
+lib/vszprintf.c
Depends-on:
stdio
@@ -12,10 +12,10 @@ errno
stdint
configure.ac:
-gl_STDIO_MODULE_INDICATOR([vzsprintf])
+gl_STDIO_MODULE_INDICATOR([vszprintf])
Makefile.am:
-lib_SOURCES += vzsprintf.c
+lib_SOURCES += vszprintf.c
Include:
<stdio.h>
diff --git a/modules/vzsprintf-gnu b/modules/vszprintf-gnu
similarity index 86%
rename from modules/vzsprintf-gnu
rename to modules/vszprintf-gnu
index 3241ea5235..a93d90ca16 100644
--- a/modules/vzsprintf-gnu
+++ b/modules/vszprintf-gnu
@@ -1,11 +1,11 @@
Description:
-vzsprintf() function
+vszprintf() function
with POSIX compliant and GNU compatible format string interpretation
Files:
Depends-on:
-vzsprintf-posix
+vszprintf-posix
mixin/printf-gnu
configure.ac:
diff --git a/modules/vszprintf-gnu-tests b/modules/vszprintf-gnu-tests
new file mode 100644
index 0000000000..5a843aafb5
--- /dev/null
+++ b/modules/vszprintf-gnu-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-vszprintf-gnu.c
+tests/test-szprintf-gnu.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vszprintf-gnu
+check_PROGRAMS += test-vszprintf-gnu
diff --git a/modules/vzsprintf-posix b/modules/vszprintf-posix
similarity index 70%
rename from modules/vzsprintf-posix
rename to modules/vszprintf-posix
index fb3428a8e1..573356060d 100644
--- a/modules/vzsprintf-posix
+++ b/modules/vszprintf-posix
@@ -1,10 +1,10 @@
Description:
-vzsprintf() function with POSIX compliant format string interpretation
+vszprintf() function with POSIX compliant format string interpretation
Files:
Depends-on:
-vzsprintf
+vszprintf
mixin/printf-posix
configure.ac:
diff --git a/modules/vszprintf-posix-tests b/modules/vszprintf-posix-tests
new file mode 100644
index 0000000000..9f430dc703
--- /dev/null
+++ b/modules/vszprintf-posix-tests
@@ -0,0 +1,14 @@
+Files:
+tests/test-vszprintf-posix.c
+tests/test-szprintf-posix.h
+tests/infinity.h
+tests/macros.h
+
+Depends-on:
+nan
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-vszprintf-posix
+check_PROGRAMS += test-vszprintf-posix
diff --git a/modules/vzsnprintf-gnu-tests b/modules/vzsnprintf-gnu-tests
deleted file mode 100644
index caf3f4ee8d..0000000000
--- a/modules/vzsnprintf-gnu-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-vzsnprintf-gnu.c
-tests/test-zsnprintf-gnu.h
-tests/macros.h
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-vzsnprintf-gnu
-check_PROGRAMS += test-vzsnprintf-gnu
diff --git a/modules/vzsnprintf-posix-tests b/modules/vzsnprintf-posix-tests
deleted file mode 100644
index 58df0a2436..0000000000
--- a/modules/vzsnprintf-posix-tests
+++ /dev/null
@@ -1,14 +0,0 @@
-Files:
-tests/test-vzsnprintf-posix.c
-tests/test-zsnprintf-posix.h
-tests/infinity.h
-tests/macros.h
-
-Depends-on:
-nan
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-vzsnprintf-posix
-check_PROGRAMS += test-vzsnprintf-posix
diff --git a/modules/vzsprintf-gnu-tests b/modules/vzsprintf-gnu-tests
deleted file mode 100644
index 38bf0381ad..0000000000
--- a/modules/vzsprintf-gnu-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-vzsprintf-gnu.c
-tests/test-zsprintf-gnu.h
-tests/macros.h
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-vzsprintf-gnu
-check_PROGRAMS += test-vzsprintf-gnu
diff --git a/modules/vzsprintf-posix-tests b/modules/vzsprintf-posix-tests
deleted file mode 100644
index ea4682d504..0000000000
--- a/modules/vzsprintf-posix-tests
+++ /dev/null
@@ -1,14 +0,0 @@
-Files:
-tests/test-vzsprintf-posix.c
-tests/test-zsprintf-posix.h
-tests/infinity.h
-tests/macros.h
-
-Depends-on:
-nan
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-vzsprintf-posix
-check_PROGRAMS += test-vzsprintf-posix
diff --git a/modules/xvasprintf b/modules/xvasprintf
index bb537ce3ee..b94bd66940 100644
--- a/modules/xvasprintf
+++ b/modules/xvasprintf
@@ -12,7 +12,7 @@ m4/strerrorname_np.m4
Depends-on:
extensions
stdio
-vazsprintf
+vaszprintf
xalloc
xalloc-die
extern-inline
diff --git a/modules/zsnprintf-gnu-tests b/modules/zsnprintf-gnu-tests
deleted file mode 100644
index 6fd7c1c83f..0000000000
--- a/modules/zsnprintf-gnu-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-zsnprintf-gnu.c
-tests/test-zsnprintf-gnu.h
-tests/macros.h
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-zsnprintf-gnu
-check_PROGRAMS += test-zsnprintf-gnu
diff --git a/modules/zsnprintf-posix-tests b/modules/zsnprintf-posix-tests
deleted file mode 100644
index 75f7594293..0000000000
--- a/modules/zsnprintf-posix-tests
+++ /dev/null
@@ -1,14 +0,0 @@
-Files:
-tests/test-zsnprintf-posix.c
-tests/test-zsnprintf-posix.h
-tests/infinity.h
-tests/macros.h
-
-Depends-on:
-nan
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-zsnprintf-posix
-check_PROGRAMS += test-zsnprintf-posix
diff --git a/modules/zsprintf-gnu-tests b/modules/zsprintf-gnu-tests
deleted file mode 100644
index 7db1e58043..0000000000
--- a/modules/zsprintf-gnu-tests
+++ /dev/null
@@ -1,12 +0,0 @@
-Files:
-tests/test-zsprintf-gnu.c
-tests/test-zsprintf-gnu.h
-tests/macros.h
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-zsprintf-gnu
-check_PROGRAMS += test-zsprintf-gnu
diff --git a/modules/zsprintf-posix-tests b/modules/zsprintf-posix-tests
deleted file mode 100644
index 8ea6819c06..0000000000
--- a/modules/zsprintf-posix-tests
+++ /dev/null
@@ -1,14 +0,0 @@
-Files:
-tests/test-zsprintf-posix.c
-tests/test-zsprintf-posix.h
-tests/infinity.h
-tests/macros.h
-
-Depends-on:
-nan
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-zsprintf-posix
-check_PROGRAMS += test-zsprintf-posix
diff --git a/tests/test-c-zsnprintf-gnu.c b/tests/test-c-snzprintf-gnu.c
similarity index 89%
rename from tests/test-c-zsnprintf-gnu.c
rename to tests/test-c-snzprintf-gnu.c
index 016c78247a..0609a6fd09 100644
--- a/tests/test-c-zsnprintf-gnu.c
+++ b/tests/test-c-snzprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible c_zsnprintf() function.
+/* Test of POSIX and GNU compatible c_snzprintf() function.
Copyright (C) 2011-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@
#include "macros.h"
-#include "test-zsnprintf-gnu.h"
+#include "test-snzprintf-gnu.h"
int
main (int argc, char *argv[])
@@ -35,7 +35,7 @@ main (int argc, char *argv[])
if (setlocale (LC_ALL, "") == NULL)
return 1;
- test_function (c_zsnprintf);
+ test_function (c_snzprintf);
return test_exit_status;
}
diff --git a/tests/test-c-zsnprintf-gnu.sh b/tests/test-c-snzprintf-gnu.sh
similarity index 88%
rename from tests/test-c-zsnprintf-gnu.sh
rename to tests/test-c-snzprintf-gnu.sh
index 3edb34ebee..66d967a9ec 100755
--- a/tests/test-c-zsnprintf-gnu.sh
+++ b/tests/test-c-snzprintf-gnu.sh
@@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then
fi
LC_ALL=$LOCALE_FR \
-${CHECKER} ./test-c-zsnprintf-gnu${EXEEXT} 1
+${CHECKER} ./test-c-snzprintf-gnu${EXEEXT} 1
diff --git a/tests/test-c-vazsprintf-gnu.c b/tests/test-c-vaszprintf-gnu.c
similarity index 78%
rename from tests/test-c-vazsprintf-gnu.c
rename to tests/test-c-vaszprintf-gnu.c
index 0db9948d06..aa8140dae5 100644
--- a/tests/test-c-vazsprintf-gnu.c
+++ b/tests/test-c-vaszprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible c_vazsprintf() and c_azsprintf() functions.
+/* Test of POSIX and GNU compatible c_vaszprintf() and c_aszprintf() functions.
Copyright (C) 2011-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,30 +26,30 @@
#include "macros.h"
-#include "test-vazsprintf-gnu.h"
+#include "test-vaszprintf-gnu.h"
static ptrdiff_t
-my_c_azsprintf (char **result, const char *format, ...)
+my_c_aszprintf (char **result, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = c_vazsprintf (result, format, args);
+ ret = c_vaszprintf (result, format, args);
va_end (args);
return ret;
}
static void
-test_c_vazsprintf ()
+test_c_vaszprintf ()
{
- test_function (my_c_azsprintf);
+ test_function (my_c_aszprintf);
}
static void
-test_c_azsprintf ()
+test_c_aszprintf ()
{
- test_function (c_azsprintf);
+ test_function (c_aszprintf);
}
int
@@ -59,8 +59,8 @@ main (int argc, char *argv[])
if (setlocale (LC_ALL, "") == NULL)
return 1;
- test_c_vazsprintf ();
- test_c_azsprintf ();
+ test_c_vaszprintf ();
+ test_c_aszprintf ();
return test_exit_status;
}
diff --git a/tests/test-c-vazsprintf-gnu.sh b/tests/test-c-vaszprintf-gnu.sh
similarity index 87%
rename from tests/test-c-vazsprintf-gnu.sh
rename to tests/test-c-vaszprintf-gnu.sh
index 1410b4e51e..79b2560c0c 100755
--- a/tests/test-c-vazsprintf-gnu.sh
+++ b/tests/test-c-vaszprintf-gnu.sh
@@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then
fi
LC_ALL=$LOCALE_FR \
-${CHECKER} ./test-c-vazsprintf-gnu${EXEEXT} 1
+${CHECKER} ./test-c-vaszprintf-gnu${EXEEXT} 1
diff --git a/tests/test-c-vzsnprintf-gnu.c b/tests/test-c-vsnzprintf-gnu.c
similarity index 83%
rename from tests/test-c-vzsnprintf-gnu.c
rename to tests/test-c-vsnzprintf-gnu.c
index 4facc1f9c3..85272e3e26 100644
--- a/tests/test-c-vzsnprintf-gnu.c
+++ b/tests/test-c-vsnzprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible c_vzsnprintf() function.
+/* Test of POSIX and GNU compatible c_vsnzprintf() function.
Copyright (C) 2011-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,16 +26,16 @@
#include "macros.h"
-#include "test-zsnprintf-gnu.h"
+#include "test-snzprintf-gnu.h"
static ptrdiff_t
-my_c_zsnprintf (char *str, size_t size, const char *format, ...)
+my_c_snzprintf (char *str, size_t size, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = c_vzsnprintf (str, size, format, args);
+ ret = c_vsnzprintf (str, size, format, args);
va_end (args);
return ret;
}
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
if (setlocale (LC_ALL, "") == NULL)
return 1;
- test_function (my_c_zsnprintf);
+ test_function (my_c_snzprintf);
return test_exit_status;
}
diff --git a/tests/test-c-vzsnprintf-gnu.sh b/tests/test-c-vsnzprintf-gnu.sh
similarity index 87%
rename from tests/test-c-vzsnprintf-gnu.sh
rename to tests/test-c-vsnzprintf-gnu.sh
index 9d416a13ef..a49ea672e6 100755
--- a/tests/test-c-vzsnprintf-gnu.sh
+++ b/tests/test-c-vsnzprintf-gnu.sh
@@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then
fi
LC_ALL=$LOCALE_FR \
-${CHECKER} ./test-c-vzsnprintf-gnu${EXEEXT} 1
+${CHECKER} ./test-c-vsnzprintf-gnu${EXEEXT} 1
diff --git a/tests/test-zsnprintf-gnu.c b/tests/test-snzprintf-gnu.c
similarity index 88%
rename from tests/test-zsnprintf-gnu.c
rename to tests/test-snzprintf-gnu.c
index efd4f5b53f..f502eebf84 100644
--- a/tests/test-zsnprintf-gnu.c
+++ b/tests/test-snzprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible zsnprintf() function.
+/* Test of POSIX and GNU compatible snzprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -25,11 +25,11 @@
#include "macros.h"
-#include "test-zsnprintf-gnu.h"
+#include "test-snzprintf-gnu.h"
int
main (int argc, char *argv[])
{
- test_function (zsnprintf);
+ test_function (snzprintf);
return test_exit_status;
}
diff --git a/tests/test-zsnprintf-gnu.h b/tests/test-snzprintf-gnu.h
similarity index 87%
rename from tests/test-zsnprintf-gnu.h
rename to tests/test-snzprintf-gnu.h
index 0e28c588ab..eb8e503079 100644
--- a/tests/test-zsnprintf-gnu.h
+++ b/tests/test-snzprintf-gnu.h
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible vzsnprintf() and zsnprintf() functions.
+/* Test of POSIX and GNU compatible vsnzprintf() and snzprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
see test-snprintf-posix.h. */
static void
-test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
+test_function (ptrdiff_t (*my_snzprintf) (char *, size_t, const char *, ...))
{
char result[5000];
@@ -30,7 +30,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on all platforms other than glibc ≥ 2.35. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%#B %d", 12345, 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%#B %d", 12345, 33, 44, 55);
ASSERT (strcmp (result, "0B11000000111001 33") == 0);
ASSERT (retval == strlen (result));
}
diff --git a/tests/test-zsnprintf-posix.c b/tests/test-snzprintf-posix.c
similarity index 89%
rename from tests/test-zsnprintf-posix.c
rename to tests/test-snzprintf-posix.c
index 0acefb59dc..673f880553 100644
--- a/tests/test-zsnprintf-posix.c
+++ b/tests/test-snzprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible zsnprintf() function.
+/* Test of POSIX compatible snzprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -25,11 +25,11 @@
#include "macros.h"
-#include "test-zsnprintf-posix.h"
+#include "test-snzprintf-posix.h"
int
main (int argc, char *argv[])
{
- test_function (zsnprintf);
+ test_function (snzprintf);
return test_exit_status;
}
diff --git a/tests/test-zsnprintf-posix.h b/tests/test-snzprintf-posix.h
similarity index 86%
rename from tests/test-zsnprintf-posix.h
rename to tests/test-snzprintf-posix.h
index 64639d4f17..46cef4f27e 100644
--- a/tests/test-zsnprintf-posix.h
+++ b/tests/test-snzprintf-posix.h
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vzsnprintf() and zsnprintf() functions.
+/* Test of POSIX compatible vsnzprintf() and snzprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ strisnan (const char *string, size_t start_index, size_t end_index, int uppercas
}
static void
-test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
+test_function (ptrdiff_t (*my_snzprintf) (char *, size_t, const char *, ...))
{
char result[5000];
@@ -54,7 +54,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%a %d", 3.1416015625, 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%a %d", 3.1416015625, 33, 44, 55);
ASSERT (strcmp (result, "0x1.922p+1 33") == 0
|| strcmp (result, "0x3.244p+0 33") == 0
|| strcmp (result, "0x6.488p-1 33") == 0
@@ -64,7 +64,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%A %d", -3.1416015625, 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%A %d", -3.1416015625, 33, 44, 55);
ASSERT (strcmp (result, "-0X1.922P+1 33") == 0
|| strcmp (result, "-0X3.244P+0 33") == 0
|| strcmp (result, "-0X6.488P-1 33") == 0
@@ -74,7 +74,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%.2a %d", 1.51, 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%.2a %d", 1.51, 33, 44, 55);
ASSERT (strcmp (result, "0x1.83p+0 33") == 0
|| strcmp (result, "0x3.05p-1 33") == 0
|| strcmp (result, "0x6.0ap-2 33") == 0
@@ -85,7 +85,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on macOS 14, FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%.0a %d", 1.51, 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%.0a %d", 1.51, 33, 44, 55);
ASSERT (strcmp (result, "0x2p+0 33") == 0
|| strcmp (result, "0x3p-1 33") == 0
|| strcmp (result, "0x6p-2 33") == 0
@@ -97,7 +97,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%f %d", Infinityd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%f %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -105,7 +105,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%f %d", NaNd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%f %d", NaNd (), 33, 44, 55);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
&& strcmp (result + strlen (result) - 3, " 33") == 0);
@@ -114,7 +114,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%010f %d", Infinityd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%010f %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, " inf 33") == 0
|| strcmp (result, " infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -124,7 +124,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%e %d", Infinityd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%e %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -132,7 +132,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%e %d", NaNd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%e %d", NaNd (), 33, 44, 55);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
&& strcmp (result + strlen (result) - 3, " 33") == 0);
@@ -143,7 +143,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%g %d", Infinityd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%g %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -151,7 +151,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%g %d", NaNd (), 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%g %d", NaNd (), 33, 44, 55);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
&& strcmp (result + strlen (result) - 3, " 33") == 0);
@@ -162,7 +162,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on AIX 7.1. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%.4000d %d", 1234567, 99);
+ my_snzprintf (result, sizeof (result), "%.4000d %d", 1234567, 99);
size_t i;
for (i = 0; i < 4000 - 7; i++)
ASSERT (result[i] == '0');
@@ -176,7 +176,7 @@ test_function (ptrdiff_t (*my_zsnprintf) (char *, size_t, const char *, ...))
{ /* This test would fail on glibc 2.34, musl libc, macOS 14,
FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsnprintf (result, sizeof (result), "%b %d", 12345, 33, 44, 55);
+ my_snzprintf (result, sizeof (result), "%b %d", 12345, 33, 44, 55);
ASSERT (strcmp (result, "11000000111001 33") == 0);
ASSERT (retval == strlen (result));
}
diff --git a/tests/test-zsprintf-gnu.c b/tests/test-szprintf-gnu.c
similarity index 89%
rename from tests/test-zsprintf-gnu.c
rename to tests/test-szprintf-gnu.c
index 8f95471d13..bdc6d1a2c0 100644
--- a/tests/test-zsprintf-gnu.c
+++ b/tests/test-szprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible zsprintf() function.
+/* Test of POSIX and GNU compatible szprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,11 +26,11 @@
#include "macros.h"
-#include "test-zsprintf-gnu.h"
+#include "test-szprintf-gnu.h"
int
main (int argc, char *argv[])
{
- test_function (zsprintf);
+ test_function (szprintf);
return test_exit_status;
}
diff --git a/tests/test-zsprintf-gnu.h b/tests/test-szprintf-gnu.h
similarity index 87%
rename from tests/test-zsprintf-gnu.h
rename to tests/test-szprintf-gnu.h
index d33a18f6f4..8f059e2e44 100644
--- a/tests/test-zsprintf-gnu.h
+++ b/tests/test-szprintf-gnu.h
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible vzsprintf() and zsprintf() functions.
+/* Test of POSIX and GNU compatible vszprintf() and szprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
see test-sprintf-posix.h. */
static void
-test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
+test_function (ptrdiff_t (*my_szprintf) (char *, const char *, ...))
{
char result[5000];
@@ -30,7 +30,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on all platforms other than glibc ≥ 2.35. */
ptrdiff_t retval =
- my_zsprintf (result, "%#B %d", 12345, 33, 44, 55);
+ my_szprintf (result, "%#B %d", 12345, 33, 44, 55);
ASSERT (strcmp (result, "0B11000000111001 33") == 0);
ASSERT (retval == strlen (result));
}
diff --git a/tests/test-zsprintf-posix.c b/tests/test-szprintf-posix.c
similarity index 89%
rename from tests/test-zsprintf-posix.c
rename to tests/test-szprintf-posix.c
index b5af845b15..fef51c7775 100644
--- a/tests/test-zsprintf-posix.c
+++ b/tests/test-szprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible zsprintf() function.
+/* Test of POSIX compatible szprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,11 +26,11 @@
#include "macros.h"
-#include "test-zsprintf-posix.h"
+#include "test-szprintf-posix.h"
int
main (int argc, char *argv[])
{
- test_function (zsprintf);
+ test_function (szprintf);
return test_exit_status;
}
diff --git a/tests/test-zsprintf-posix.h b/tests/test-szprintf-posix.h
similarity index 86%
rename from tests/test-zsprintf-posix.h
rename to tests/test-szprintf-posix.h
index c12754970d..6ab9cfc3e3 100644
--- a/tests/test-zsprintf-posix.h
+++ b/tests/test-szprintf-posix.h
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vzsprintf() and zsprintf() functions.
+/* Test of POSIX compatible vszprintf() and szprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ strisnan (const char *string, size_t start_index, size_t end_index, int uppercas
}
static void
-test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
+test_function (ptrdiff_t (*my_szprintf) (char *, const char *, ...))
{
char result[5000];
@@ -54,7 +54,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%a %d", 3.1416015625, 33, 44, 55);
+ my_szprintf (result, "%a %d", 3.1416015625, 33, 44, 55);
ASSERT (strcmp (result, "0x1.922p+1 33") == 0
|| strcmp (result, "0x3.244p+0 33") == 0
|| strcmp (result, "0x6.488p-1 33") == 0
@@ -64,7 +64,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%A %d", -3.1416015625, 33, 44, 55);
+ my_szprintf (result, "%A %d", -3.1416015625, 33, 44, 55);
ASSERT (strcmp (result, "-0X1.922P+1 33") == 0
|| strcmp (result, "-0X3.244P+0 33") == 0
|| strcmp (result, "-0X6.488P-1 33") == 0
@@ -74,7 +74,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
ptrdiff_t retval =
- my_zsprintf (result, "%.2a %d", 1.51, 33, 44, 55);
+ my_szprintf (result, "%.2a %d", 1.51, 33, 44, 55);
ASSERT (strcmp (result, "0x1.83p+0 33") == 0
|| strcmp (result, "0x3.05p-1 33") == 0
|| strcmp (result, "0x6.0ap-2 33") == 0
@@ -85,7 +85,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on macOS 14, FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%.0a %d", 1.51, 33, 44, 55);
+ my_szprintf (result, "%.0a %d", 1.51, 33, 44, 55);
ASSERT (strcmp (result, "0x2p+0 33") == 0
|| strcmp (result, "0x3p-1 33") == 0
|| strcmp (result, "0x6p-2 33") == 0
@@ -97,7 +97,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%f %d", Infinityd (), 33, 44, 55);
+ my_szprintf (result, "%f %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -105,7 +105,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%f %d", NaNd (), 33, 44, 55);
+ my_szprintf (result, "%f %d", NaNd (), 33, 44, 55);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
&& strcmp (result + strlen (result) - 3, " 33") == 0);
@@ -114,7 +114,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%010f %d", Infinityd (), 33, 44, 55);
+ my_szprintf (result, "%010f %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, " inf 33") == 0
|| strcmp (result, " infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -124,7 +124,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%e %d", Infinityd (), 33, 44, 55);
+ my_szprintf (result, "%e %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -132,7 +132,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%e %d", NaNd (), 33, 44, 55);
+ my_szprintf (result, "%e %d", NaNd (), 33, 44, 55);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
&& strcmp (result + strlen (result) - 3, " 33") == 0);
@@ -143,7 +143,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%g %d", Infinityd (), 33, 44, 55);
+ my_szprintf (result, "%g %d", Infinityd (), 33, 44, 55);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
ASSERT (retval == strlen (result));
@@ -151,7 +151,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%g %d", NaNd (), 33, 44, 55);
+ my_szprintf (result, "%g %d", NaNd (), 33, 44, 55);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
&& strcmp (result + strlen (result) - 3, " 33") == 0);
@@ -162,7 +162,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on AIX 7.1. */
ptrdiff_t retval =
- my_zsprintf (result, "%.4000d %d", 1234567, 99);
+ my_szprintf (result, "%.4000d %d", 1234567, 99);
size_t i;
for (i = 0; i < 4000 - 7; i++)
ASSERT (result[i] == '0');
@@ -176,7 +176,7 @@ test_function (ptrdiff_t (*my_zsprintf) (char *, const char *, ...))
{ /* This test would fail on glibc 2.34, musl libc, macOS 14,
FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
ptrdiff_t retval =
- my_zsprintf (result, "%b %d", 12345, 33, 44, 55);
+ my_szprintf (result, "%b %d", 12345, 33, 44, 55);
ASSERT (strcmp (result, "11000000111001 33") == 0);
ASSERT (retval == strlen (result));
}
diff --git a/tests/test-vazsprintf-gnu.c b/tests/test-vaszprintf-gnu.c
similarity index 79%
rename from tests/test-vazsprintf-gnu.c
rename to tests/test-vaszprintf-gnu.c
index f0c015d1fb..357554e833 100644
--- a/tests/test-vazsprintf-gnu.c
+++ b/tests/test-vaszprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible vazsprintf() and azsprintf() functions.
+/* Test of POSIX and GNU compatible vaszprintf() and aszprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -31,36 +31,36 @@
#include "macros.h"
-#include "test-vazsprintf-gnu.h"
+#include "test-vaszprintf-gnu.h"
static ptrdiff_t
-my_azsprintf (char **result, const char *format, ...)
+my_aszprintf (char **result, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = vazsprintf (result, format, args);
+ ret = vaszprintf (result, format, args);
va_end (args);
return ret;
}
static void
-test_vazsprintf ()
+test_vaszprintf ()
{
- test_function (my_azsprintf);
+ test_function (my_aszprintf);
}
static void
-test_azsprintf ()
+test_aszprintf ()
{
- test_function (azsprintf);
+ test_function (aszprintf);
}
int
main (int argc, char *argv[])
{
- test_vazsprintf ();
- test_azsprintf ();
+ test_vaszprintf ();
+ test_aszprintf ();
return test_exit_status;
}
diff --git a/tests/test-vazsprintf-gnu.h b/tests/test-vaszprintf-gnu.h
similarity index 86%
rename from tests/test-vazsprintf-gnu.h
rename to tests/test-vaszprintf-gnu.h
index 0aba9faa6a..498c8ef730 100644
--- a/tests/test-vazsprintf-gnu.h
+++ b/tests/test-vaszprintf-gnu.h
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible vazsprintf() and azsprintf() functions.
+/* Test of POSIX and GNU compatible vaszprintf() and aszprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
/* Written by Bruno Haible <br...@clisp.org>, 2024. */
static void
-test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
+test_function (ptrdiff_t (*my_aszprintf) (char **, const char *, ...))
{
/* Test the support of the 'B' conversion specifier for binary output of
integers. */
@@ -25,7 +25,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on all platforms other than glibc ≥ 2.35. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%#B %d", 12345, 33, 44, 55);
+ my_aszprintf (&result, "%#B %d", 12345, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "0B11000000111001 33") == 0);
ASSERT (retval == strlen (result));
diff --git a/tests/test-vazsprintf-posix.c b/tests/test-vaszprintf-posix.c
similarity index 85%
rename from tests/test-vazsprintf-posix.c
rename to tests/test-vaszprintf-posix.c
index 550596652c..0e6af1c371 100644
--- a/tests/test-vazsprintf-posix.c
+++ b/tests/test-vaszprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vazsprintf() and azsprintf() functions.
+/* Test of POSIX compatible vaszprintf() and aszprintf() functions.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -55,7 +55,7 @@ strisnan (const char *string, size_t start_index, size_t end_index, int uppercas
}
static void
-test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
+test_function (ptrdiff_t (*my_aszprintf) (char **, const char *, ...))
{
char result[5000];
@@ -65,7 +65,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%a %d", 3.1416015625, 33, 44, 55);
+ my_aszprintf (&result, "%a %d", 3.1416015625, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "0x1.922p+1 33") == 0
|| strcmp (result, "0x3.244p+0 33") == 0
@@ -78,7 +78,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%A %d", -3.1416015625, 33, 44, 55);
+ my_aszprintf (&result, "%A %d", -3.1416015625, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "-0X1.922P+1 33") == 0
|| strcmp (result, "-0X3.244P+0 33") == 0
@@ -91,7 +91,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on FreeBSD 6.1, NetBSD 10.0. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%.2a %d", 1.51, 33, 44, 55);
+ my_aszprintf (&result, "%.2a %d", 1.51, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "0x1.83p+0 33") == 0
|| strcmp (result, "0x3.05p-1 33") == 0
@@ -105,7 +105,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%.0a %d", 1.51, 33, 44, 55);
+ my_aszprintf (&result, "%.0a %d", 1.51, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "0x2p+0 33") == 0
|| strcmp (result, "0x3p-1 33") == 0
@@ -120,7 +120,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%f %d", Infinityd (), 33, 44, 55);
+ my_aszprintf (&result, "%f %d", Infinityd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
@@ -131,7 +131,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%f %d", NaNd (), 33, 44, 55);
+ my_aszprintf (&result, "%f %d", NaNd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
@@ -143,7 +143,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%010f %d", Infinityd (), 33, 44, 55);
+ my_aszprintf (&result, "%010f %d", Infinityd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, " inf 33") == 0
|| strcmp (result, " infinity 33") == 0);
@@ -156,7 +156,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%e %d", Infinityd (), 33, 44, 55);
+ my_aszprintf (&result, "%e %d", Infinityd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
@@ -167,7 +167,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%e %d", NaNd (), 33, 44, 55);
+ my_aszprintf (&result, "%e %d", NaNd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
@@ -181,7 +181,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%g %d", Infinityd (), 33, 44, 55);
+ my_aszprintf (&result, "%g %d", Infinityd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "inf 33") == 0
|| strcmp (result, "infinity 33") == 0);
@@ -192,7 +192,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%g %d", NaNd (), 33, 44, 55);
+ my_aszprintf (&result, "%g %d", NaNd (), 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strlen (result) >= 3 + 3
&& strisnan (result, 0, strlen (result) - 3, 0)
@@ -206,7 +206,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
{ /* This test would fail on AIX 7.1. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%.4000d %d", 1234567, 99);
+ my_aszprintf (&result, "%.4000d %d", 1234567, 99);
ASSERT (result != NULL);
size_t i;
for (i = 0; i < 4000 - 7; i++)
@@ -223,7 +223,7 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
FreeBSD 13.2, NetBSD 10.0, OpenBSD 7.5, AIX 7.3, Solaris 11.4. */
char *result;
ptrdiff_t retval =
- my_azsprintf (&result, "%b %d", 12345, 33, 44, 55);
+ my_aszprintf (&result, "%b %d", 12345, 33, 44, 55);
ASSERT (result != NULL);
ASSERT (strcmp (result, "11000000111001 33") == 0);
ASSERT (retval == strlen (result));
@@ -232,33 +232,33 @@ test_function (ptrdiff_t (*my_azsprintf) (char **, const char *, ...))
}
static ptrdiff_t
-my_azsprintf (char **result, const char *format, ...)
+my_aszprintf (char **result, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = vazsprintf (result, format, args);
+ ret = vaszprintf (result, format, args);
va_end (args);
return ret;
}
static void
-test_vazsprintf ()
+test_vaszprintf ()
{
- test_function (my_azsprintf);
+ test_function (my_aszprintf);
}
static void
-test_azsprintf ()
+test_aszprintf ()
{
- test_function (azsprintf);
+ test_function (aszprintf);
}
int
main (int argc, char *argv[])
{
- test_vazsprintf ();
- test_azsprintf ();
+ test_vaszprintf ();
+ test_aszprintf ();
return test_exit_status;
}
diff --git a/tests/test-vzsnprintf-gnu.c b/tests/test-vsnzprintf-gnu.c
similarity index 82%
rename from tests/test-vzsnprintf-gnu.c
rename to tests/test-vsnzprintf-gnu.c
index 65e893c050..d47ff964b0 100644
--- a/tests/test-vzsnprintf-gnu.c
+++ b/tests/test-vsnzprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible vzsnprintf() function.
+/* Test of POSIX and GNU compatible vsnzprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,16 +26,16 @@
#include "macros.h"
-#include "test-zsnprintf-gnu.h"
+#include "test-snzprintf-gnu.h"
static ptrdiff_t
-my_zsnprintf (char *str, size_t size, const char *format, ...)
+my_snzprintf (char *str, size_t size, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = vzsnprintf (str, size, format, args);
+ ret = vsnzprintf (str, size, format, args);
va_end (args);
return ret;
}
@@ -43,6 +43,6 @@ my_zsnprintf (char *str, size_t size, const char *format, ...)
int
main (int argc, char *argv[])
{
- test_function (my_zsnprintf);
+ test_function (my_snzprintf);
return test_exit_status;
}
diff --git a/tests/test-vzsnprintf-posix.c b/tests/test-vsnzprintf-posix.c
similarity index 82%
rename from tests/test-vzsnprintf-posix.c
rename to tests/test-vsnzprintf-posix.c
index e44b94cafc..f245796eb1 100644
--- a/tests/test-vzsnprintf-posix.c
+++ b/tests/test-vsnzprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vzsnprintf() function.
+/* Test of POSIX compatible vsnzprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,16 +26,16 @@
#include "macros.h"
-#include "test-zsnprintf-posix.h"
+#include "test-snzprintf-posix.h"
static ptrdiff_t
-my_zsnprintf (char *str, size_t size, const char *format, ...)
+my_snzprintf (char *str, size_t size, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = vzsnprintf (str, size, format, args);
+ ret = vsnzprintf (str, size, format, args);
va_end (args);
return ret;
}
@@ -43,6 +43,6 @@ my_zsnprintf (char *str, size_t size, const char *format, ...)
int
main (int argc, char *argv[])
{
- test_function (my_zsnprintf);
+ test_function (my_snzprintf);
return test_exit_status;
}
diff --git a/tests/test-vzsprintf-gnu.c b/tests/test-vszprintf-gnu.c
similarity index 83%
rename from tests/test-vzsprintf-gnu.c
rename to tests/test-vszprintf-gnu.c
index 8920fa1ca5..e77855b985 100644
--- a/tests/test-vzsprintf-gnu.c
+++ b/tests/test-vszprintf-gnu.c
@@ -1,4 +1,4 @@
-/* Test of POSIX and GNU compatible vzsprintf() function.
+/* Test of POSIX and GNU compatible vszprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,16 +26,16 @@
#include "macros.h"
-#include "test-zsprintf-gnu.h"
+#include "test-szprintf-gnu.h"
static ptrdiff_t
-my_zsprintf (char *str, const char *format, ...)
+my_szprintf (char *str, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = vzsprintf (str, format, args);
+ ret = vszprintf (str, format, args);
va_end (args);
return ret;
}
@@ -43,6 +43,6 @@ my_zsprintf (char *str, const char *format, ...)
int
main (int argc, char *argv[])
{
- test_function (my_zsprintf);
+ test_function (my_szprintf);
return test_exit_status;
}
diff --git a/tests/test-vzsprintf-posix.c b/tests/test-vszprintf-posix.c
similarity index 84%
rename from tests/test-vzsprintf-posix.c
rename to tests/test-vszprintf-posix.c
index a3dd260731..10f021311d 100644
--- a/tests/test-vzsprintf-posix.c
+++ b/tests/test-vszprintf-posix.c
@@ -1,4 +1,4 @@
-/* Test of POSIX compatible vzsprintf() function.
+/* Test of POSIX compatible vszprintf() function.
Copyright (C) 2007-2024 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -26,16 +26,16 @@
#include "macros.h"
-#include "test-zsprintf-posix.h"
+#include "test-szprintf-posix.h"
static ptrdiff_t
-my_zsprintf (char *str, const char *format, ...)
+my_szprintf (char *str, const char *format, ...)
{
va_list args;
ptrdiff_t ret;
va_start (args, format);
- ret = vzsprintf (str, format, args);
+ ret = vszprintf (str, format, args);
va_end (args);
return ret;
}
@@ -43,6 +43,6 @@ my_zsprintf (char *str, const char *format, ...)
int
main (int argc, char *argv[])
{
- test_function (my_zsprintf);
+ test_function (my_szprintf);
return test_exit_status;
}
--
2.34.1
