mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make internal lock-init macros return void.

Browse Source
This commit is contained in:
Roland McGrath 2014-10-20 14:13:14 -07:00
parent f50277c19d
commit ab49e7630f
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2014-10-20 Roland McGrath <roland@hack.frob.com>
* sysdeps/nptl/bits/libc-lock.h
[_LIBC && (!NOT_IN_libc || IS_IN_libpthread)]
(__libc_lock_init_recursive): Return void, not 0.
* sysdeps/nptl/bits/libc-lockP.h (__libc_lock_init): Likewise.
(__libc_rwlock_init): Likewise.
* sysdeps/nptl/bits/stdio-lock.h (_IO_lock_init): Likewise.
2014-10-20 Torvald Riegel <triegel@redhat.com>
[BZ #15215]

2
sysdeps/nptl/bits/libc-lock.h
View File

@ -62,7 +62,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
/* Initialize a recursive mutex. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
# define __libc_lock_init_recursive(NAME) \
((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER, 0)
((void) ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER))
#else
# define __libc_lock_init_recursive(NAME) \
do { \

8
sysdeps/nptl/bits/libc-lockP.h
View File

@ -126,16 +126,16 @@ typedef pthread_key_t __libc_key_t;
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
#if !defined NOT_IN_libc || defined IS_IN_libpthread
# define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
# define __libc_lock_init(NAME) \
((void) ((NAME) = LLL_LOCK_INITIALIZER))
#else
# define __libc_lock_init(NAME) \
__libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0)
#endif
#if defined SHARED && !defined NOT_IN_libc
/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER, 0) is
inefficient. */
/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER) is inefficient. */
# define __libc_rwlock_init(NAME) \
(__builtin_memset (&(NAME), '\0', sizeof (NAME)), 0)
((void) __builtin_memset (&(NAME), '\0', sizeof (NAME)))
#else
# define __libc_rwlock_init(NAME) \
__libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0)

2
sysdeps/nptl/bits/stdio-lock.h
View File

@ -31,7 +31,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
#define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }
#define _IO_lock_init(_name) \
((_name) = (_IO_lock_t) _IO_lock_initializer , 0)
((void) ((_name) = (_IO_lock_t) _IO_lock_initializer))
#define _IO_lock_fini(_name) \
((void) 0)