chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: modernizations
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index f7d84fc723d233bd05fde439356ac124125b4733..9d14933bc11c0439e4cf697bb32f221b3d6eb675 100644
(file)
--- a/
src/shared/logs-show.c
+++ b/
src/shared/logs-show.c
@@
-1139,7
+1139,7
@@
int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) {
}
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
}
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
- _cleanup_close_p
ipe
_ int pair[2] = { -1, -1 };
+ _cleanup_close_p
air
_ int pair[2] = { -1, -1 };
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
pid_t pid, child;
siginfo_t si;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
pid_t pid, child;
siginfo_t si;
@@
-1171,8
+1171,7
@@
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
if (child == 0) {
int fd;
if (child == 0) {
int fd;
- close_nointr_nofail(pair[0]);
- pair[0] = -1;
+ pair[0] = safe_close(pair[0]);
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
@@
-1183,7
+1182,7
@@
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
_exit(EXIT_FAILURE);
k = loop_read(fd, buf, 36, false);
_exit(EXIT_FAILURE);
k = loop_read(fd, buf, 36, false);
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
if (k != 36)
_exit(EXIT_FAILURE);
if (k != 36)
_exit(EXIT_FAILURE);
@@
-1194,8
+1193,7
@@
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
_exit(EXIT_SUCCESS);
}
_exit(EXIT_SUCCESS);
}
- close_nointr_nofail(pair[1]);
- pair[1] = -1;
+ pair[1] = safe_close(pair[1]);
r = wait_for_terminate(child, &si);
if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS)
r = wait_for_terminate(child, &si);
if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS)