chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmpfiles: add new "C" line for copying files or directories
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index d19d648129c04792f6d6b8ec6892117f38113206..64a62ffeae6f51b0f3f86aed4e39aa6275621006 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-151,9
+151,9
@@
int inhibitor_start(Inhibitor *i) {
dual_timestamp_get(&i->since);
dual_timestamp_get(&i->since);
- log_debug("Inhibitor %s (%s) pid=
%lu uid=%lu
mode=%s started.",
+ log_debug("Inhibitor %s (%s) pid=
"PID_FMT" uid="UID_FMT"
mode=%s started.",
strna(i->who), strna(i->why),
strna(i->who), strna(i->why),
-
(unsigned long) i->pid, (unsigned long)
i->uid,
+
i->pid,
i->uid,
inhibit_mode_to_string(i->mode));
inhibitor_save(i);
inhibit_mode_to_string(i->mode));
inhibitor_save(i);
@@
-169,9
+169,9
@@
int inhibitor_stop(Inhibitor *i) {
assert(i);
if (i->started)
assert(i);
if (i->started)
- log_debug("Inhibitor %s (%s) pid=
%lu uid=%lu
mode=%s stopped.",
+ log_debug("Inhibitor %s (%s) pid=
"PID_FMT" uid="UID_FMT"
mode=%s stopped.",
strna(i->who), strna(i->why),
strna(i->who), strna(i->why),
-
(unsigned long) i->pid, (unsigned long)
i->uid,
+
i->pid,
i->uid,
inhibit_mode_to_string(i->mode));
if (i->state_file)
inhibit_mode_to_string(i->mode));
if (i->state_file)
@@
-253,8
+253,7
@@
int inhibitor_load(Inhibitor *i) {
int fd;
fd = inhibitor_create_fifo(i);
int fd;
fd = inhibitor_create_fifo(i);
- if (fd >= 0)
- close_nointr_nofail(fd);
+ safe_close(fd);
}
return 0;
}
return 0;
@@
-320,13
+319,8
@@
int inhibitor_create_fifo(Inhibitor *i) {
void inhibitor_remove_fifo(Inhibitor *i) {
assert(i);
void inhibitor_remove_fifo(Inhibitor *i) {
assert(i);
- if (i->event_source)
- i->event_source = sd_event_source_unref(i->event_source);
-
- if (i->fifo_fd >= 0) {
- close_nointr_nofail(i->fifo_fd);
- i->fifo_fd = -1;
- }
+ i->event_source = sd_event_source_unref(i->event_source);
+ i->fifo_fd = safe_close(i->fifo_fd);
if (i->fifo_path) {
unlink(i->fifo_path);
if (i->fifo_path) {
unlink(i->fifo_path);