summaryrefslogtreecommitdiff
path: root/lib/mbtowc-lock.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mbtowc-lock.h')
-rw-r--r--lib/mbtowc-lock.h11
1 files changed, 4 insertions, 7 deletions
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 ();