summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 22:23:34 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 22:23:34 +0000
commitb4e90ccd813fcc25273e44f19dfc67c836602087 (patch)
tree048824226d0608dc2437f167456a5b23ec0fd9f2
parentb5a884970d64d941896590b2f8c537c18eb02512 (diff)
parent53ff5d6b3824a5ffb790964e30c5c3b56ea520ec (diff)
Merge commit 'refs/top-bases/tschwinge/Roger_Whittaker' into tschwinge/Roger_Whittaker
-rw-r--r--sysdeps/mach/hurd/shmget.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/shmget.c b/sysdeps/mach/hurd/shmget.c
index 2065b41989..5e05214185 100644
--- a/sysdeps/mach/hurd/shmget.c
+++ b/sysdeps/mach/hurd/shmget.c
@@ -78,11 +78,10 @@ static error_t
get_exclusive (int shmflags, size_t size, key_t *r_key, int *r_fd)
{
error_t err;
- file_t dir;
- file_t file;
+ file_t dir = MACH_PORT_NULL;
+ file_t file = MACH_PORT_NULL;
char filename[SHM_NAMEMAX];
key_t key = *r_key;
- bool is_private;
/* Create the shared memory segment. */
err = create_shm_file (size, shmflags, &dir, &file);
@@ -91,7 +90,6 @@ get_exclusive (int shmflags, size_t size, key_t *r_key, int *r_fd)
if (key == IPC_PRIVATE)
{
- is_private = true;
key = SHM_PRIV_KEY_START;
/* Try to link the shared memory segment into the filesystem