diff options
Diffstat (limited to 'lib/unistdio')
72 files changed, 93 insertions, 101 deletions
diff --git a/lib/unistdio/u-asnprintf.h b/lib/unistdio/u-asnprintf.h index 302b3e51..a892e82a 100644 --- a/lib/unistdio/u-asnprintf.h +++ b/lib/unistdio/u-asnprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -27,10 +27,8 @@ DCHAR_T * ASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, const FCHAR_T *format, ...) { va_list args; - DCHAR_T *result; - va_start (args, format); - result = VASNPRINTF (resultbuf, lengthp, format, args); + DCHAR_T *result = VASNPRINTF (resultbuf, lengthp, format, args); va_end (args); return result; } diff --git a/lib/unistdio/u-asprintf.h b/lib/unistdio/u-asprintf.h index bbec610e..0857d6d8 100644 --- a/lib/unistdio/u-asprintf.h +++ b/lib/unistdio/u-asprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -27,10 +27,8 @@ int ASPRINTF (DCHAR_T **resultp, const FCHAR_T *format, ...) { va_list args; - int result; - va_start (args, format); - result = VASPRINTF (resultp, format, args); + int result = VASPRINTF (resultp, format, args); va_end (args); return result; } diff --git a/lib/unistdio/u-printf-args.c b/lib/unistdio/u-printf-args.c index c8545194..ce9c9ef7 100644 --- a/lib/unistdio/u-printf-args.c +++ b/lib/unistdio/u-printf-args.c @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u-printf-args.h b/lib/unistdio/u-printf-args.h index e8c38758..2e88f1d2 100644 --- a/lib/unistdio/u-printf-args.h +++ b/lib/unistdio/u-printf-args.h @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u-printf-parse.h b/lib/unistdio/u-printf-parse.h index 6292aa10..9bd58c24 100644 --- a/lib/unistdio/u-printf-parse.h +++ b/lib/unistdio/u-printf-parse.h @@ -1,5 +1,5 @@ /* Parse printf format string. - Copyright (C) 1999, 2002, 2005, 2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005, 2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u-snprintf.h b/lib/unistdio/u-snprintf.h index c74bf876..0c2186b3 100644 --- a/lib/unistdio/u-snprintf.h +++ b/lib/unistdio/u-snprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -27,10 +27,8 @@ int SNPRINTF (DCHAR_T *buf, size_t size, const FCHAR_T *format, ...) { va_list args; - int result; - va_start (args, format); - result = VSNPRINTF (buf, size, format, args); + int result = VSNPRINTF (buf, size, format, args); va_end (args); return result; } diff --git a/lib/unistdio/u-sprintf.h b/lib/unistdio/u-sprintf.h index 8b65188e..d3d50a63 100644 --- a/lib/unistdio/u-sprintf.h +++ b/lib/unistdio/u-sprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -27,10 +27,8 @@ int SPRINTF (DCHAR_T *buf, const FCHAR_T *format, ...) { va_list args; - int result; - va_start (args, format); - result = VSPRINTF (buf, format, args); + int result = VSPRINTF (buf, format, args); va_end (args); return result; } diff --git a/lib/unistdio/u-vasprintf.h b/lib/unistdio/u-vasprintf.h index bc04a0f5..1e994823 100644 --- a/lib/unistdio/u-vasprintf.h +++ b/lib/unistdio/u-vasprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2024 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2026 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". diff --git a/lib/unistdio/u-vsnprintf.h b/lib/unistdio/u-vsnprintf.h index 50abaf30..e4105324 100644 --- a/lib/unistdio/u-vsnprintf.h +++ b/lib/unistdio/u-vsnprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2024 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2026 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". @@ -26,13 +26,12 @@ int VSNPRINTF (DCHAR_T *buf, size_t size, const FCHAR_T *format, va_list args) { size_t length; - DCHAR_T *result; if (size == 0) buf = NULL; else length = size; - result = VASNPRINTF (buf, &length, format, args); + DCHAR_T *result = VASNPRINTF (buf, &length, format, args); if (result == NULL) return -1; diff --git a/lib/unistdio/u-vsprintf.h b/lib/unistdio/u-vsprintf.h index 60b1b7f1..4cc7506b 100644 --- a/lib/unistdio/u-vsprintf.h +++ b/lib/unistdio/u-vsprintf.h @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2024 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2026 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". @@ -34,15 +34,13 @@ VSPRINTF (DCHAR_T *buf, const FCHAR_T *format, va_list args) Also note that glibc's iconv fails with E2BIG when we pass a length that is so large that buf + length wraps around, i.e. (uintptr_t) (buf + length) < (uintptr_t) buf. */ - size_t length; - DCHAR_T *result; /* Set length = min (SIZE_MAX, INT_MAX, - (uintptr_t) buf - 1). */ - length = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX); + size_t length = (SIZE_MAX < INT_MAX ? SIZE_MAX : INT_MAX); if (length > (~ (uintptr_t) buf) / sizeof (DCHAR_T)) length = (~ (uintptr_t) buf) / sizeof (DCHAR_T); - result = VASNPRINTF (buf, &length, format, args); + DCHAR_T *result = VASNPRINTF (buf, &length, format, args); if (result == NULL) return -1; diff --git a/lib/unistdio/u16-asnprintf.c b/lib/unistdio/u16-asnprintf.c index d558b701..31ffca73 100644 --- a/lib/unistdio/u16-asnprintf.c +++ b/lib/unistdio/u16-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-asprintf.c b/lib/unistdio/u16-asprintf.c index eed4f082..dd8c7b43 100644 --- a/lib/unistdio/u16-asprintf.c +++ b/lib/unistdio/u16-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-printf-parse.c b/lib/unistdio/u16-printf-parse.c index c8db8a74..17ef8e06 100644 --- a/lib/unistdio/u16-printf-parse.c +++ b/lib/unistdio/u16-printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2024 Free Software + Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-snprintf.c b/lib/unistdio/u16-snprintf.c index a07c9e7f..6dc5694b 100644 --- a/lib/unistdio/u16-snprintf.c +++ b/lib/unistdio/u16-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-sprintf.c b/lib/unistdio/u16-sprintf.c index 69b04974..eb699fa7 100644 --- a/lib/unistdio/u16-sprintf.c +++ b/lib/unistdio/u16-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-asnprintf.c b/lib/unistdio/u16-u16-asnprintf.c index 39ef34e7..cb733a57 100644 --- a/lib/unistdio/u16-u16-asnprintf.c +++ b/lib/unistdio/u16-u16-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-asprintf.c b/lib/unistdio/u16-u16-asprintf.c index fba52cba..e353916e 100644 --- a/lib/unistdio/u16-u16-asprintf.c +++ b/lib/unistdio/u16-u16-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-snprintf.c b/lib/unistdio/u16-u16-snprintf.c index bf4a5c9e..80b936bd 100644 --- a/lib/unistdio/u16-u16-snprintf.c +++ b/lib/unistdio/u16-u16-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-sprintf.c b/lib/unistdio/u16-u16-sprintf.c index 20d4f53d..47602e37 100644 --- a/lib/unistdio/u16-u16-sprintf.c +++ b/lib/unistdio/u16-u16-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-vasnprintf.c b/lib/unistdio/u16-u16-vasnprintf.c index c7ea8ddd..35a31868 100644 --- a/lib/unistdio/u16-u16-vasnprintf.c +++ b/lib/unistdio/u16-u16-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to UTF-16 strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -48,6 +48,7 @@ #define DCHAR_T uint16_t #define DCHAR_CPY u16_cpy #define DCHAR_SET u16_set +#define DCHAR_STRLEN u16_strlen #define DCHAR_MBSNLEN u16_mbsnlen #define DCHAR_IS_UINT16_T 1 #define U8_TO_DCHAR u8_to_u16 diff --git a/lib/unistdio/u16-u16-vasprintf.c b/lib/unistdio/u16-u16-vasprintf.c index 1f57a389..5513e469 100644 --- a/lib/unistdio/u16-u16-vasprintf.c +++ b/lib/unistdio/u16-u16-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-vsnprintf.c b/lib/unistdio/u16-u16-vsnprintf.c index 157baa09..b6b3bb4f 100644 --- a/lib/unistdio/u16-u16-vsnprintf.c +++ b/lib/unistdio/u16-u16-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-u16-vsprintf.c b/lib/unistdio/u16-u16-vsprintf.c index f95d1643..f8d86c95 100644 --- a/lib/unistdio/u16-u16-vsprintf.c +++ b/lib/unistdio/u16-u16-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-vasnprintf.c b/lib/unistdio/u16-vasnprintf.c index 9e53aa29..20b730e3 100644 --- a/lib/unistdio/u16-vasnprintf.c +++ b/lib/unistdio/u16-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to UTF-16 strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -49,6 +49,7 @@ #define DCHAR_T uint16_t #define DCHAR_CPY u16_cpy #define DCHAR_SET u16_set +#define DCHAR_STRLEN u16_strlen #define DCHAR_MBSNLEN u16_mbsnlen #define DCHAR_IS_UINT16_T 1 #define U8_TO_DCHAR u8_to_u16 diff --git a/lib/unistdio/u16-vasprintf.c b/lib/unistdio/u16-vasprintf.c index 67cfdf23..510c27fc 100644 --- a/lib/unistdio/u16-vasprintf.c +++ b/lib/unistdio/u16-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-vsnprintf.c b/lib/unistdio/u16-vsnprintf.c index 1cbb1c49..6bce523f 100644 --- a/lib/unistdio/u16-vsnprintf.c +++ b/lib/unistdio/u16-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u16-vsprintf.c b/lib/unistdio/u16-vsprintf.c index e4e420b5..ef221b89 100644 --- a/lib/unistdio/u16-vsprintf.c +++ b/lib/unistdio/u16-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-asnprintf.c b/lib/unistdio/u32-asnprintf.c index eed6cec7..46f91e17 100644 --- a/lib/unistdio/u32-asnprintf.c +++ b/lib/unistdio/u32-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-asprintf.c b/lib/unistdio/u32-asprintf.c index dafebcc3..6124d066 100644 --- a/lib/unistdio/u32-asprintf.c +++ b/lib/unistdio/u32-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-printf-parse.c b/lib/unistdio/u32-printf-parse.c index 2b101851..4f7bf784 100644 --- a/lib/unistdio/u32-printf-parse.c +++ b/lib/unistdio/u32-printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2024 Free Software + Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-snprintf.c b/lib/unistdio/u32-snprintf.c index b1d142a4..3d3c1f13 100644 --- a/lib/unistdio/u32-snprintf.c +++ b/lib/unistdio/u32-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-sprintf.c b/lib/unistdio/u32-sprintf.c index 65316e4d..edc2ea78 100644 --- a/lib/unistdio/u32-sprintf.c +++ b/lib/unistdio/u32-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-asnprintf.c b/lib/unistdio/u32-u32-asnprintf.c index 616a355b..8521d4f0 100644 --- a/lib/unistdio/u32-u32-asnprintf.c +++ b/lib/unistdio/u32-u32-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-asprintf.c b/lib/unistdio/u32-u32-asprintf.c index 71087e75..f1654a0e 100644 --- a/lib/unistdio/u32-u32-asprintf.c +++ b/lib/unistdio/u32-u32-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-snprintf.c b/lib/unistdio/u32-u32-snprintf.c index 1be4c1a9..840dc5a7 100644 --- a/lib/unistdio/u32-u32-snprintf.c +++ b/lib/unistdio/u32-u32-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-sprintf.c b/lib/unistdio/u32-u32-sprintf.c index bcc144a8..76f00bd3 100644 --- a/lib/unistdio/u32-u32-sprintf.c +++ b/lib/unistdio/u32-u32-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-vasnprintf.c b/lib/unistdio/u32-u32-vasnprintf.c index f2ff161d..3c2a5b93 100644 --- a/lib/unistdio/u32-u32-vasnprintf.c +++ b/lib/unistdio/u32-u32-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to UTF-32 strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -48,6 +48,7 @@ #define DCHAR_T uint32_t #define DCHAR_CPY u32_cpy #define DCHAR_SET u32_set +#define DCHAR_STRLEN u32_strlen #define DCHAR_MBSNLEN u32_mbsnlen #define DCHAR_IS_UINT32_T 1 #define U8_TO_DCHAR u8_to_u32 diff --git a/lib/unistdio/u32-u32-vasprintf.c b/lib/unistdio/u32-u32-vasprintf.c index 8f9ef2aa..627ff486 100644 --- a/lib/unistdio/u32-u32-vasprintf.c +++ b/lib/unistdio/u32-u32-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-vsnprintf.c b/lib/unistdio/u32-u32-vsnprintf.c index 54dbeba3..d12aecd8 100644 --- a/lib/unistdio/u32-u32-vsnprintf.c +++ b/lib/unistdio/u32-u32-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-u32-vsprintf.c b/lib/unistdio/u32-u32-vsprintf.c index af823d71..de1e9f78 100644 --- a/lib/unistdio/u32-u32-vsprintf.c +++ b/lib/unistdio/u32-u32-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-vasnprintf.c b/lib/unistdio/u32-vasnprintf.c index 855a66a0..005a5784 100644 --- a/lib/unistdio/u32-vasnprintf.c +++ b/lib/unistdio/u32-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to UTF-32 strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -49,6 +49,7 @@ #define DCHAR_T uint32_t #define DCHAR_CPY u32_cpy #define DCHAR_SET u32_set +#define DCHAR_STRLEN u32_strlen #define DCHAR_MBSNLEN u32_mbsnlen #define DCHAR_IS_UINT32_T 1 #define U8_TO_DCHAR u8_to_u32 diff --git a/lib/unistdio/u32-vasprintf.c b/lib/unistdio/u32-vasprintf.c index 8760c93f..c9a6131e 100644 --- a/lib/unistdio/u32-vasprintf.c +++ b/lib/unistdio/u32-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-vsnprintf.c b/lib/unistdio/u32-vsnprintf.c index 806f3281..e745218f 100644 --- a/lib/unistdio/u32-vsnprintf.c +++ b/lib/unistdio/u32-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u32-vsprintf.c b/lib/unistdio/u32-vsprintf.c index 67802237..0b8d1b7b 100644 --- a/lib/unistdio/u32-vsprintf.c +++ b/lib/unistdio/u32-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-asnprintf.c b/lib/unistdio/u8-asnprintf.c index 67a5d29c..83c47c64 100644 --- a/lib/unistdio/u8-asnprintf.c +++ b/lib/unistdio/u8-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-asprintf.c b/lib/unistdio/u8-asprintf.c index 4255e32b..02a53ab5 100644 --- a/lib/unistdio/u8-asprintf.c +++ b/lib/unistdio/u8-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-printf-parse.c b/lib/unistdio/u8-printf-parse.c index 77da2d4b..23eb384f 100644 --- a/lib/unistdio/u8-printf-parse.c +++ b/lib/unistdio/u8-printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2024 Free Software + Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-snprintf.c b/lib/unistdio/u8-snprintf.c index 9809a66e..7dff6ae0 100644 --- a/lib/unistdio/u8-snprintf.c +++ b/lib/unistdio/u8-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-sprintf.c b/lib/unistdio/u8-sprintf.c index 3c2f6b41..f99a4c14 100644 --- a/lib/unistdio/u8-sprintf.c +++ b/lib/unistdio/u8-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-asnprintf.c b/lib/unistdio/u8-u8-asnprintf.c index 2b11f2f1..eb75fb89 100644 --- a/lib/unistdio/u8-u8-asnprintf.c +++ b/lib/unistdio/u8-u8-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-asprintf.c b/lib/unistdio/u8-u8-asprintf.c index 0b171ec1..a7a8d5a6 100644 --- a/lib/unistdio/u8-u8-asprintf.c +++ b/lib/unistdio/u8-u8-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-snprintf.c b/lib/unistdio/u8-u8-snprintf.c index acd50158..cc3c36a7 100644 --- a/lib/unistdio/u8-u8-snprintf.c +++ b/lib/unistdio/u8-u8-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-sprintf.c b/lib/unistdio/u8-u8-sprintf.c index 9eed64bb..b49271da 100644 --- a/lib/unistdio/u8-u8-sprintf.c +++ b/lib/unistdio/u8-u8-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-vasnprintf.c b/lib/unistdio/u8-u8-vasnprintf.c index c5e8f748..d757d6f1 100644 --- a/lib/unistdio/u8-u8-vasnprintf.c +++ b/lib/unistdio/u8-u8-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to UTF-8 strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -48,6 +48,7 @@ #define DCHAR_T uint8_t #define DCHAR_CPY u8_cpy #define DCHAR_SET u8_set +#define DCHAR_STRLEN u8_strlen #define DCHAR_MBSNLEN u8_mbsnlen #define DCHAR_IS_UINT8_T 1 #define U16_TO_DCHAR u16_to_u8 diff --git a/lib/unistdio/u8-u8-vasprintf.c b/lib/unistdio/u8-u8-vasprintf.c index fff309e2..29a940d5 100644 --- a/lib/unistdio/u8-u8-vasprintf.c +++ b/lib/unistdio/u8-u8-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-vsnprintf.c b/lib/unistdio/u8-u8-vsnprintf.c index 8b7681d1..b4a38d4f 100644 --- a/lib/unistdio/u8-u8-vsnprintf.c +++ b/lib/unistdio/u8-u8-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-u8-vsprintf.c b/lib/unistdio/u8-u8-vsprintf.c index f37fff35..a54c0e72 100644 --- a/lib/unistdio/u8-u8-vsprintf.c +++ b/lib/unistdio/u8-u8-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-vasnprintf.c b/lib/unistdio/u8-vasnprintf.c index 2dd8e0ba..d142e959 100644 --- a/lib/unistdio/u8-vasnprintf.c +++ b/lib/unistdio/u8-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to UTF-8 strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -49,6 +49,7 @@ #define DCHAR_T uint8_t #define DCHAR_CPY u8_cpy #define DCHAR_SET u8_set +#define DCHAR_STRLEN u8_strlen #define DCHAR_MBSNLEN u8_mbsnlen #define DCHAR_IS_UINT8_T 1 #define U16_TO_DCHAR u16_to_u8 diff --git a/lib/unistdio/u8-vasprintf.c b/lib/unistdio/u8-vasprintf.c index e97067c1..0fc6147f 100644 --- a/lib/unistdio/u8-vasprintf.c +++ b/lib/unistdio/u8-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-vsnprintf.c b/lib/unistdio/u8-vsnprintf.c index 4d818e47..2ed10a95 100644 --- a/lib/unistdio/u8-vsnprintf.c +++ b/lib/unistdio/u8-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/u8-vsprintf.c b/lib/unistdio/u8-vsprintf.c index 5f904f6a..68036b13 100644 --- a/lib/unistdio/u8-vsprintf.c +++ b/lib/unistdio/u8-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-asnprintf.c b/lib/unistdio/ulc-asnprintf.c index 05f1cc2e..f9655f60 100644 --- a/lib/unistdio/ulc-asnprintf.c +++ b/lib/unistdio/ulc-asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-asprintf.c b/lib/unistdio/ulc-asprintf.c index 135fee90..0f9117e9 100644 --- a/lib/unistdio/ulc-asprintf.c +++ b/lib/unistdio/ulc-asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-fprintf.c b/lib/unistdio/ulc-fprintf.c index 5ef0e7ce..4a0610c7 100644 --- a/lib/unistdio/ulc-fprintf.c +++ b/lib/unistdio/ulc-fprintf.c @@ -1,5 +1,5 @@ /* Formatted output to a stream. - Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2026 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". @@ -43,15 +43,14 @@ int ulc_fprintf (FILE *fp, const char *format, ...) { + va_list args; + va_start (args, format); + char buf[2000]; - char *output; - size_t len; size_t lenbuf = sizeof (buf); - va_list args; + char *output = ulc_vasnprintf (buf, &lenbuf, format, args); + size_t len = lenbuf; - va_start (args, format); - output = ulc_vasnprintf (buf, &lenbuf, format, args); - len = lenbuf; va_end (args); if (!output) diff --git a/lib/unistdio/ulc-printf-parse.c b/lib/unistdio/ulc-printf-parse.c index 7188d9d2..d391f074 100644 --- a/lib/unistdio/ulc-printf-parse.c +++ b/lib/unistdio/ulc-printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2024 Free Software + Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-snprintf.c b/lib/unistdio/ulc-snprintf.c index e7f91ec2..55ac1ac4 100644 --- a/lib/unistdio/ulc-snprintf.c +++ b/lib/unistdio/ulc-snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-sprintf.c b/lib/unistdio/ulc-sprintf.c index c3a6737c..a969896e 100644 --- a/lib/unistdio/ulc-sprintf.c +++ b/lib/unistdio/ulc-sprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2005-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2005-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-vasnprintf.c b/lib/unistdio/ulc-vasnprintf.c index 4cc4fe4a..0e47ca40 100644 --- a/lib/unistdio/ulc-vasnprintf.c +++ b/lib/unistdio/ulc-vasnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. @@ -49,6 +49,7 @@ #define DCHAR_T char #define DCHAR_CPY memcpy #define DCHAR_SET memset +#define DCHAR_STRLEN strlen #define DCHAR_MBSNLEN mbsnlen #define TCHAR_T char #define DCHAR_IS_TCHAR 1 diff --git a/lib/unistdio/ulc-vasprintf.c b/lib/unistdio/ulc-vasprintf.c index 023c43f7..e6b76b63 100644 --- a/lib/unistdio/ulc-vasprintf.c +++ b/lib/unistdio/ulc-vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-vfprintf.c b/lib/unistdio/ulc-vfprintf.c index 483d49a5..50173e89 100644 --- a/lib/unistdio/ulc-vfprintf.c +++ b/lib/unistdio/ulc-vfprintf.c @@ -1,5 +1,5 @@ /* Formatted output to a stream. - Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2026 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". @@ -44,12 +44,9 @@ int ulc_vfprintf (FILE *fp, const char *format, va_list args) { char buf[2000]; - char *output; - size_t len; size_t lenbuf = sizeof (buf); - - output = ulc_vasnprintf (buf, &lenbuf, format, args); - len = lenbuf; + char *output = ulc_vasnprintf (buf, &lenbuf, format, args); + size_t len = lenbuf; if (!output) { diff --git a/lib/unistdio/ulc-vsnprintf.c b/lib/unistdio/ulc-vsnprintf.c index b7188994..ce3ef10e 100644 --- a/lib/unistdio/ulc-vsnprintf.c +++ b/lib/unistdio/ulc-vsnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. diff --git a/lib/unistdio/ulc-vsprintf.c b/lib/unistdio/ulc-vsprintf.c index 3301c4a2..34f2175d 100644 --- a/lib/unistdio/ulc-vsprintf.c +++ b/lib/unistdio/ulc-vsprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. This file is free software. |