chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: hashmap_move_one() should return -ENOENT when 'other' is NULL
[elogind.git]
/
src
/
journal
/
test-mmap-cache.c
diff --git
a/src/journal/test-mmap-cache.c
b/src/journal/test-mmap-cache.c
index e2ffaf4723b290eaa99dd15dbb731e38974c86a0..778e884c3ff032927498c4b215221b75e3538500 100644
(file)
--- 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 <stdlib.h>
#include <sys/mman.h>
#include <unistd.h>
+#include <fcntl.h>
#include "log.h"
#include "macro.h"
#include "log.h"
#include "macro.h"
@@
-36,44
+37,44
@@
int main(int argc, char *argv[]) {
assert_se(m = mmap_cache_new());
assert_se(m = mmap_cache_new());
- x = mk
stemp(px
);
+ x = mk
ostemp_safe(px, O_RDWR|O_CLOEXEC
);
assert(x >= 0);
unlink(px);
assert(x >= 0);
unlink(px);
- y = mk
stemp(py
);
+ y = mk
ostemp_safe(py, O_RDWR|O_CLOEXEC
);
assert(y >= 0);
unlink(py);
assert(y >= 0);
unlink(py);
- z = mk
stemp(pz
);
+ z = mk
ostemp_safe(pz, O_RDWR|O_CLOEXEC
);
assert(z >= 0);
unlink(pz);
assert(z >= 0);
unlink(pz);
- r = mmap_cache_get(m, x, PROT_READ, 0, false, 1, 2, NULL, &p);
+ r = mmap_cache_get(m, x, PROT_READ, 0, false, 1, 2, NULL, &p
, NULL
);
assert(r >= 0);
assert(r >= 0);
- r = mmap_cache_get(m, x, PROT_READ, 0, false, 2, 2, NULL, &q);
+ r = mmap_cache_get(m, x, PROT_READ, 0, false, 2, 2, NULL, &q
, NULL
);
assert(r >= 0);
assert((uint8_t*) p + 1 == (uint8_t*) q);
assert(r >= 0);
assert((uint8_t*) p + 1 == (uint8_t*) q);
- r = mmap_cache_get(m, x, PROT_READ, 1, false, 3, 2, NULL, &q);
+ r = mmap_cache_get(m, x, PROT_READ, 1, false, 3, 2, NULL, &q
, NULL
);
assert(r >= 0);
assert((uint8_t*) p + 2 == (uint8_t*) q);
assert(r >= 0);
assert((uint8_t*) p + 2 == (uint8_t*) q);
- r = mmap_cache_get(m, x, PROT_READ, 0, false, 16ULL*1024ULL*1024ULL, 2, NULL, &p);
+ r = mmap_cache_get(m, x, PROT_READ, 0, false, 16ULL*1024ULL*1024ULL, 2, NULL, &p
, NULL
);
assert(r >= 0);
assert(r >= 0);
- r = mmap_cache_get(m, x, PROT_READ, 1, false, 16ULL*1024ULL*1024ULL+1, 2, NULL, &q);
+ r = mmap_cache_get(m, x, PROT_READ, 1, false, 16ULL*1024ULL*1024ULL+1, 2, NULL, &q
, NULL
);
assert(r >= 0);
assert((uint8_t*) p + 1 == (uint8_t*) q);
mmap_cache_unref(m);
assert(r >= 0);
assert((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;
}
return 0;
}