From 27dae84ed92f1ef0300263091972338d12e78348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 18 Oct 2025 19:06:52 +0200 Subject: New upstream version 1.4.1 --- lib/mbtowc-lock.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/mbtowc-lock.h') diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h index 10f7dc7c..1e67c96e 100644 --- a/lib/mbtowc-lock.h +++ b/lib/mbtowc-lock.h @@ -1,5 +1,5 @@ /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2024 Free Software Foundation, Inc. + Copyright (C) 2019-2025 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -23,7 +23,7 @@ mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m) { /* Put the hidden internal state of mbtowc into an initial state. This is needed at least with glibc, uClibc, and MSVC CRT. - See . */ + See . */ mbtowc (NULL, NULL, 0); return mbtowc (pwc, p, m); @@ -59,7 +59,7 @@ mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) return ret; } -#elif HAVE_PTHREAD_API /* AIX, IRIX, Cygwin */ +#elif HAVE_PTHREAD_API /* AIX, Cygwin */ extern # if defined _WIN32 || defined __CYGWIN__ @@ -67,7 +67,7 @@ extern # endif pthread_mutex_t *gl_get_mbtowc_lock (void); -# if HAVE_WEAK_SYMBOLS /* IRIX */ +# if HAVE_WEAK_SYMBOLS /* Avoid the need to link with '-lpthread'. */ # pragma weak pthread_mutex_lock -- cgit v1.2.3 From 5f59a34ab747dde8ede7357f3431bf06bd6002fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Mar 2026 17:28:33 +0100 Subject: New upstream version 1.4.2 --- lib/mbtowc-lock.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/mbtowc-lock.h') diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h index 1e67c96e..b3e4e28e 100644 --- a/lib/mbtowc-lock.h +++ b/lib/mbtowc-lock.h @@ -1,5 +1,5 @@ /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2025 Free Software Foundation, Inc. + Copyright (C) 2019-2026 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -50,10 +50,9 @@ static int mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) { CRITICAL_SECTION *lock = gl_get_mbtowc_lock (); - int ret; EnterCriticalSection (lock); - ret = mbtowc_unlocked (pwc, p, m); + int ret = mbtowc_unlocked (pwc, p, m); LeaveCriticalSection (lock); return ret; @@ -89,11 +88,10 @@ mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) if (pthread_in_use()) { pthread_mutex_t *lock = gl_get_mbtowc_lock (); - int ret; if (pthread_mutex_lock (lock)) abort (); - ret = mbtowc_unlocked (pwc, p, m); + int ret = mbtowc_unlocked (pwc, p, m); if (pthread_mutex_unlock (lock)) abort (); @@ -111,11 +109,10 @@ static int mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) { mtx_t *lock = gl_get_mbtowc_lock (); - int ret; if (mtx_lock (lock) != thrd_success) abort (); - ret = mbtowc_unlocked (pwc, p, m); + int ret = mbtowc_unlocked (pwc, p, m); if (mtx_unlock (lock) != thrd_success) abort (); -- cgit v1.2.3