From 0eeb4c1d32aab0dbfd2a8f20aa326ae2d98ca1c6 Mon Sep 17 00:00:00 2001 From: Freddie Chopin Date: Sun, 29 Jan 2017 10:27:17 +0100 Subject: Unify names of all lock objects In preparation for the patch that would allow retargeting of locking routines, rename all lock objects to follow this pattern: "___[recursive_]mutex". Following locks were renamed: __dd_hash_lock -> __dd_hash_mutex __sfp_lock -> __sfp_recursive_mutex __sinit_lock -> __sinit_recursive_mutex __atexit_lock -> __atexit_recursive_mutex _arc4random_mutex -> __arc4random_mutex __env_lock_object -> __env_recursive_mutex __malloc_lock_object -> __malloc_recursive_mutex __atexit_mutex -> __at_quick_exit_mutex __tz_lock_object -> __tz_mutex --- newlib/libc/stdio/findfp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'newlib/libc/stdio/findfp.c') diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 975a855c2..83d3dc558 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -261,31 +261,31 @@ _DEFUN(__sinit, (s), #ifndef __SINGLE_THREAD__ -__LOCK_INIT_RECURSIVE(static, __sfp_lock); -__LOCK_INIT_RECURSIVE(static, __sinit_lock); +__LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex); +__LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex); _VOID _DEFUN_VOID(__sfp_lock_acquire) { - __lock_acquire_recursive (__sfp_lock); + __lock_acquire_recursive (__sfp_recursive_mutex); } _VOID _DEFUN_VOID(__sfp_lock_release) { - __lock_release_recursive (__sfp_lock); + __lock_release_recursive (__sfp_recursive_mutex); } _VOID _DEFUN_VOID(__sinit_lock_acquire) { - __lock_acquire_recursive (__sinit_lock); + __lock_acquire_recursive (__sinit_recursive_mutex); } _VOID _DEFUN_VOID(__sinit_lock_release) { - __lock_release_recursive (__sinit_lock); + __lock_release_recursive (__sinit_recursive_mutex); } /* Walkable file locking routine. */ -- cgit v1.2.3