diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 13:29:44 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 13:29:44 +0000 |
| commit | 13a4ee0bb4ccb6691729bde67233f5ca66209c7c (patch) | |
| tree | 72d62fed4d091a1f38c021d9c3eab5e50044e8c4 /nptl/sem_open.c | |
| parent | 0923a2c896f09795cca4a6d800a336a56b0ee42c (diff) | |
| download | glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.tar glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.tar.gz glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.tar.bz2 glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.zip | |
[BZ #4745]
[BZ #4586]
[BZ #4702]
[BZ #4525]
[BZ #4514]
[BZ #4512]
Merge selected bugfixes from the trunk.
Diffstat (limited to 'nptl/sem_open.c')
| -rw-r--r-- | nptl/sem_open.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nptl/sem_open.c b/nptl/sem_open.c index 27d308e920..66bcb13aec 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 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -304,14 +304,12 @@ sem_open (const char *name, int oflag, ...) /* Create the initial file content. */ sem_t initsem; - struct new_sem *iinitsem = (struct new_sem *) &initsem; - iinitsem->value = value; - iinitsem->private = 0; - iinitsem->nwaiters = 0; + struct sem *iinitsem = (struct sem *) &initsem; + iinitsem->count = value; /* Initialize the remaining bytes as well. */ - memset ((char *) &initsem + sizeof (struct new_sem), '\0', - sizeof (sem_t) - sizeof (struct new_sem)); + memset ((char *) &initsem + sizeof (struct sem), '\0', + sizeof (sem_t) - sizeof (struct sem)); tmpfname = (char *) alloca (mountpoint.dirlen + 6 + 1); char *xxxxxx = __mempcpy (tmpfname, mountpoint.dir, mountpoint.dirlen); |