X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-mmap-cache.c;h=3fcd77475d99f442101b6be4cd2ff2ddbe69ef12;hb=fa6ac76083b8ffc1309876459f54f9f0e2843731;hp=e2ffaf4723b290eaa99dd15dbb731e38974c86a0;hpb=2a2507e60df45b69d69a026661f865b971ff4f29;p=elogind.git

diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
index e2ffaf472..3fcd77475 100644
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "log.h"
 #include "macro.h"
@@ -36,44 +37,44 @@ int main(int argc, char *argv[]) {
 
         assert_se(m = mmap_cache_new());
 
-        x = mkstemp(px);
-        assert(x >= 0);
+        x = mkostemp_safe(px, O_RDWR|O_CLOEXEC);
+        assert_se(x >= 0);
         unlink(px);
 
-        y = mkstemp(py);
-        assert(y >= 0);
+        y = mkostemp_safe(py, O_RDWR|O_CLOEXEC);
+        assert_se(y >= 0);
         unlink(py);
 
-        z = mkstemp(pz);
-        assert(z >= 0);
+        z = mkostemp_safe(pz, O_RDWR|O_CLOEXEC);
+        assert_se(z >= 0);
         unlink(pz);
 
         r = mmap_cache_get(m, x, PROT_READ, 0, false, 1, 2, NULL, &p);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         r = mmap_cache_get(m, x, PROT_READ, 0, false, 2, 2, NULL, &q);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
-        assert((uint8_t*) p + 1 == (uint8_t*) q);
+        assert_se((uint8_t*) p + 1 == (uint8_t*) q);
 
         r = mmap_cache_get(m, x, PROT_READ, 1, false, 3, 2, NULL, &q);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
-        assert((uint8_t*) p + 2 == (uint8_t*) q);
+        assert_se((uint8_t*) p + 2 == (uint8_t*) q);
 
         r = mmap_cache_get(m, x, PROT_READ, 0, false, 16ULL*1024ULL*1024ULL, 2, NULL, &p);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         r = mmap_cache_get(m, x, PROT_READ, 1, false, 16ULL*1024ULL*1024ULL+1, 2, NULL, &q);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
-        assert((uint8_t*) p + 1 == (uint8_t*) q);
+        assert_se((uint8_t*) p + 1 == (uint8_t*) q);
 
         mmap_cache_unref(m);
 
-        close_nointr_nofail(x);
-        close_nointr_nofail(y);
-        close_nointr_nofail(z);
+        safe_close(x);
+        safe_close(y);
+        safe_close(z);
 
         return 0;
 }