Rename some static variables

Rename some static variables to give them unique names.
This commit is contained in:
Siddhesh Poyarekar 2013-03-18 13:44:05 +05:30
parent b2e1393c60
commit 69854bb5e9
4 changed files with 19 additions and 6 deletions

View File

@ -1,3 +1,15 @@
2013-03-18 Siddhesh Poyarekar <siddhesh@redhat.com>
* pthread_barrier_init.c (default_attr): Rename to
default_barrierattr.
(pthread_barrier_init): Adjust for the rename.
* pthread_mutex_init.c (default_attr): Rename to
default_mutexattr.
(__pthread_mutex_init): Adjust for the rename.
* pthread_rwlock_init.c (default_attr): Rebane to
default_rwlockattr.
(__pthread_rwlock_init): Adjust for the rename.
2013-03-12 Carlos O'Donell <carlos@redhat.com>
* sysdeps/unix/sysv/linux/lowlevellock.c: Include <atomic.h>.

View File

@ -22,7 +22,7 @@
#include <kernel-features.h>
static const struct pthread_barrierattr default_attr =
static const struct pthread_barrierattr default_barrierattr =
{
.pshared = PTHREAD_PROCESS_PRIVATE
};
@ -42,7 +42,7 @@ pthread_barrier_init (barrier, attr, count)
const struct pthread_barrierattr *iattr
= (attr != NULL
? iattr = (struct pthread_barrierattr *) attr
: &default_attr);
: &default_barrierattr);
if (iattr->pshared != PTHREAD_PROCESS_PRIVATE
&& __builtin_expect (iattr->pshared != PTHREAD_PROCESS_SHARED, 0))

View File

@ -24,7 +24,7 @@
#include <stap-probe.h>
static const struct pthread_mutexattr default_attr =
static const struct pthread_mutexattr default_mutexattr =
{
/* Default is a normal mutex, not shared between processes. */
.mutexkind = PTHREAD_MUTEX_NORMAL
@ -45,7 +45,8 @@ __pthread_mutex_init (mutex, mutexattr)
assert (sizeof (pthread_mutex_t) <= __SIZEOF_PTHREAD_MUTEX_T);
imutexattr = (const struct pthread_mutexattr *) mutexattr ?: &default_attr;
imutexattr = ((const struct pthread_mutexattr *) mutexattr
?: &default_mutexattr);
/* Sanity checks. */
switch (__builtin_expect (imutexattr->mutexkind

View File

@ -21,7 +21,7 @@
#include <kernel-features.h>
static const struct pthread_rwlockattr default_attr =
static const struct pthread_rwlockattr default_rwlockattr =
{
.lockkind = PTHREAD_RWLOCK_DEFAULT_NP,
.pshared = PTHREAD_PROCESS_PRIVATE
@ -35,7 +35,7 @@ __pthread_rwlock_init (rwlock, attr)
{
const struct pthread_rwlockattr *iattr;
iattr = ((const struct pthread_rwlockattr *) attr) ?: &default_attr;
iattr = ((const struct pthread_rwlockattr *) attr) ?: &default_rwlockattr;
memset (rwlock, '\0', sizeof (*rwlock));