From: Bruno Haible Date: Wed, 22 Mar 2023 20:28:21 +0000 (+0100) Subject: vasnwprintf: Fix a "warning: unused function local_wcsnlen". X-Git-Tag: v1.0~1604 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c4aea2186305767e7a2d0eda1ce856a342dce365;p=gnulib.git vasnwprintf: Fix a "warning: unused function local_wcsnlen". * lib/vasnprintf.c: Adjust #if conditions. --- diff --git a/ChangeLog b/ChangeLog index 91b03df0b0..39f5b2c117 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-03-22 Bruno Haible + + vasnwprintf: Fix a "warning: unused function local_wcsnlen". + * lib/vasnprintf.c: Adjust #if conditions. + 2023-03-22 Bruno Haible vasnwprintf: Fix test failures on FreeBSD, NetBSD, AIX, mingw. diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 5ea3e45d63..618fae7c77 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -270,7 +270,7 @@ local_wcslen (const wchar_t *s) # endif #endif -#if (!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION +#if (!USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION # if HAVE_WCSNLEN # define local_wcsnlen wcsnlen # else @@ -5088,7 +5088,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION size_t width; #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION int has_precision; size_t precision; #endif @@ -5151,7 +5151,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION has_precision = 0; precision = 6; if (dp->precision_start != dp->precision_end)