Skip to content

Commit

Permalink
* sem_open.c (sem_open): Rewrite initialization of initsem to
Browse files Browse the repository at this point in the history
	avoid warnings.
  • Loading branch information
Ulrich Drepper committed Apr 26, 2009
1 parent f521be3 commit 5efe865
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
3 changes: 3 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
19 changes: 11 additions & 8 deletions nptl/sem_open.c
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit 5efe865

Please sign in to comment.