X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-mmap-cache.c;h=1227b62310462a5e5ae8d1caf3aa476631c6a84a;hb=b7307642391c8ebb9724c99e6b33239e2c0ff944;hp=7d03bfe9d15525cada49d31fd005c612d3f92d88;hpb=2d5bdf5bc0e4714d42e5999a4e37553a6bf83575;p=elogind.git

diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
index 7d03bfe9d..1227b6231 100644
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -38,43 +38,43 @@ int main(int argc, char *argv[]) {
         assert_se(m = mmap_cache_new());
 
         x = mkostemp_safe(px, O_RDWR|O_CLOEXEC);
-        assert(x >= 0);
+        assert_se(x >= 0);
         unlink(px);
 
         y = mkostemp_safe(py, O_RDWR|O_CLOEXEC);
-        assert(y >= 0);
+        assert_se(y >= 0);
         unlink(py);
 
         z = mkostemp_safe(pz, O_RDWR|O_CLOEXEC);
-        assert(z >= 0);
+        assert_se(z >= 0);
         unlink(pz);
 
-        r = mmap_cache_get(m, x, PROT_READ, 0, false, 1, 2, NULL, &p);
-        assert(r >= 0);
+        r = mmap_cache_get(m, x, PROT_READ, 0, false, 1, 2, NULL, &p, NULL);
+        assert_se(r >= 0);
 
-        r = mmap_cache_get(m, x, PROT_READ, 0, false, 2, 2, NULL, &q);
-        assert(r >= 0);
+        r = mmap_cache_get(m, x, PROT_READ, 0, false, 2, 2, NULL, &q, NULL);
+        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);
+        r = mmap_cache_get(m, x, PROT_READ, 1, false, 3, 2, NULL, &q, NULL);
+        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);
+        r = mmap_cache_get(m, x, PROT_READ, 0, false, 16ULL*1024ULL*1024ULL, 2, NULL, &p, NULL);
+        assert_se(r >= 0);
 
-        r = mmap_cache_get(m, x, PROT_READ, 1, false, 16ULL*1024ULL*1024ULL+1, 2, NULL, &q);
-        assert(r >= 0);
+        r = mmap_cache_get(m, x, PROT_READ, 1, false, 16ULL*1024ULL*1024ULL+1, 2, NULL, &q, NULL);
+        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;
 }