chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: replace close_nointr_nofail() by a more useful safe_close()
[elogind.git]
/
src
/
journal
/
journal-verify.c
diff --git
a/src/journal/journal-verify.c
b/src/journal/journal-verify.c
index 9434cc925cc58c1dc4e32cf02c165750c52b1149..31bae5a8f8f01fca57e5b34e0c2b6466f86dfafc 100644
(file)
--- a/
src/journal/journal-verify.c
+++ b/
src/journal/journal-verify.c
@@
-1222,9
+1222,9
@@
int journal_file_verify(
mmap_cache_close_fd(f->mmap, entry_fd);
mmap_cache_close_fd(f->mmap, entry_array_fd);
mmap_cache_close_fd(f->mmap, entry_fd);
mmap_cache_close_fd(f->mmap, entry_array_fd);
-
close_nointr_nofail
(data_fd);
-
close_nointr_nofail
(entry_fd);
-
close_nointr_nofail
(entry_array_fd);
+
safe_close
(data_fd);
+
safe_close
(entry_fd);
+
safe_close
(entry_array_fd);
if (first_contained)
*first_contained = le64toh(f->header->head_entry_realtime);
if (first_contained)
*first_contained = le64toh(f->header->head_entry_realtime);
@@
-1247,17
+1247,17
@@
fail:
if (data_fd >= 0) {
mmap_cache_close_fd(f->mmap, data_fd);
if (data_fd >= 0) {
mmap_cache_close_fd(f->mmap, data_fd);
-
close_nointr_nofail
(data_fd);
+
safe_close
(data_fd);
}
if (entry_fd >= 0) {
mmap_cache_close_fd(f->mmap, entry_fd);
}
if (entry_fd >= 0) {
mmap_cache_close_fd(f->mmap, entry_fd);
-
close_nointr_nofail
(entry_fd);
+
safe_close
(entry_fd);
}
if (entry_array_fd >= 0) {
mmap_cache_close_fd(f->mmap, entry_array_fd);
}
if (entry_array_fd >= 0) {
mmap_cache_close_fd(f->mmap, entry_array_fd);
-
close_nointr_nofail
(entry_array_fd);
+
safe_close
(entry_array_fd);
}
return r;
}
return r;