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
/
cat.c
diff --git
a/src/journal/cat.c
b/src/journal/cat.c
index 02b75642a33ab9fb3de3e30c20fea8607db73909..60625cb6ddd311d84ec0f51a404d58e2a4c9f007 100644
(file)
--- a/
src/journal/cat.c
+++ b/
src/journal/cat.c
@@
-152,7
+152,7
@@
int main(int argc, char *argv[]) {
}
if (fd >= 3)
}
if (fd >= 3)
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
fd = -1;
fd = -1;
@@
-170,11
+170,8
@@
int main(int argc, char *argv[]) {
log_error("Failed to execute process: %s", strerror(-r));
finish:
log_error("Failed to execute process: %s", strerror(-r));
finish:
- if (fd >= 0)
- close_nointr_nofail(fd);
-
- if (saved_stderr >= 0)
- close_nointr_nofail(saved_stderr);
+ safe_close(fd);
+ safe_close(saved_stderr);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}