diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-04-26 18:37:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-04-26 18:37:05 +0000 |
| commit | 5efe86507d871acd6f52d8d25ee437b7394ac6d5 (patch) | |
| tree | bc11c1bdf0b42e265fc35a67f081f27df6527e73 /nptl | |
| parent | f521be31b96b5ca8b6d24c388d644f5dfcafac7d (diff) | |
* sem_open.c (sem_open): Rewrite initialization of initsem to
avoid warnings.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/sem_open.c | 19 |
2 files changed, 14 insertions, 8 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 5091c8393f..838a010034 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2009-04-26 Ulrich Drepper <drepper@redhat.com> + * sem_open.c (sem_open): Rewrite initialization of initsem to + avoid warnings. + * sysdeps/unix/sysv/linux/libc_pthread_init.c (__libc_pthread_init): Avoid warning by using may_alias attribute on ptrhack. diff --git a/nptl/sem_open.c b/nptl/sem_open.c index e58dde9472..4e603491c0 100644 --- a/nptl/sem_open.c +++ b/nptl/sem_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2006, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -302,15 +302,18 @@ sem_open (const char *name, int oflag, ...) } /* Create the initial file content. */ - sem_t initsem; + union + { + sem_t initsem; + struct new_sem newsem; + } sem; - struct new_sem *iinitsem = (struct new_sem *) &initsem; - iinitsem->value = value; - iinitsem->private = 0; - iinitsem->nwaiters = 0; + sem.newsem.value = value; + sem.newsem.private = 0; + sem.newsem.nwaiters = 0; /* Initialize the remaining bytes as well. */ - memset ((char *) &initsem + sizeof (struct new_sem), '\0', + memset ((char *) &sem.initsem + sizeof (struct new_sem), '\0', sizeof (sem_t) - sizeof (struct new_sem)); tmpfname = (char *) alloca (mountpoint.dirlen + 6 + 1); @@ -349,7 +352,7 @@ sem_open (const char *name, int oflag, ...) break; } - if (TEMP_FAILURE_RETRY (__libc_write (fd, &initsem, sizeof (sem_t))) + if (TEMP_FAILURE_RETRY (__libc_write (fd, &sem.initsem, sizeof (sem_t))) == sizeof (sem_t) /* Map the sem_t structure from the file. */ && (result = (sem_t *) mmap (NULL, sizeof (sem_t), |