diff options
| author | Topi Miettinen <topimiettinen@users.noreply.github.com> | 2016-09-13 08:20:38 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-09-13 08:20:38 +0200 |
| commit | 646853bdd8b1337204643aa014ff3f1f49d91a4f (patch) | |
| tree | aaeea183f1648a27916dc36f7c0e4468f6039faf /src/test/test-fd-util.c | |
| parent | Relicense hwdb/parse_hwdb.py as MIT (#4129) (diff) | |
| download | systemd-646853bdd8b1337204643aa014ff3f1f49d91a4f.tar.xz systemd-646853bdd8b1337204643aa014ff3f1f49d91a4f.zip | |
fileio: simplify mkostemp_safe() (#4090)
According to its manual page, flags given to mkostemp(3) shouldn't include
O_RDWR, O_CREAT or O_EXCL flags as these are always included. Beyond
those, the only flag that all callers (except a few tests where it
probably doesn't matter) use is O_CLOEXEC, so set that unconditionally.
Diffstat (limited to 'src/test/test-fd-util.c')
| -rw-r--r-- | src/test/test-fd-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index 421d3bdeb3..f555bb976c 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -31,9 +31,9 @@ static void test_close_many(void) { char name1[] = "/tmp/test-close-many.XXXXXX"; char name2[] = "/tmp/test-close-many.XXXXXX"; - fds[0] = mkostemp_safe(name0, O_RDWR|O_CLOEXEC); - fds[1] = mkostemp_safe(name1, O_RDWR|O_CLOEXEC); - fds[2] = mkostemp_safe(name2, O_RDWR|O_CLOEXEC); + fds[0] = mkostemp_safe(name0); + fds[1] = mkostemp_safe(name1); + fds[2] = mkostemp_safe(name2); close_many(fds, 2); @@ -52,7 +52,7 @@ static void test_close_nointr(void) { char name[] = "/tmp/test-test-close_nointr.XXXXXX"; int fd; - fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); + fd = mkostemp_safe(name); assert_se(fd >= 0); assert_se(close_nointr(fd) >= 0); assert_se(close_nointr(fd) < 0); |