summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 22:23:12 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 22:23:12 +0000
commitca24e2604e9c54671f361f3bcfdd7e02bb04a130 (patch)
treebba7f21de6c52def9f108cb2338468e189bafbca /sysdeps
parent7f502f0aa68851dc073fbcf96ee52e2095000c6c (diff)
parent9cad99c3f2551146c0f6ad3ea7475e86287e28a2 (diff)
Merge branch 't/sysvshm' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
-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