chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: allow informing systemd about service status changes with RELOADING=1 and STOPP...
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index d19d648129c04792f6d6b8ec6892117f38113206..a9e14af8dbf29148b1f510a765740f9d70f17a1b 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);
@@
-445,23
+439,23
@@
const char *inhibit_what_to_string(InhibitWhat w) {
InhibitWhat inhibit_what_from_string(const char *s) {
InhibitWhat what = 0;
InhibitWhat inhibit_what_from_string(const char *s) {
InhibitWhat what = 0;
- c
har *w
, *state;
+ c
onst char *word
, *state;
size_t l;
size_t l;
- FOREACH_WORD_SEPARATOR(w, l, s, ":", state) {
- if (l == 8 && strneq(w, "shutdown", l))
+ FOREACH_WORD_SEPARATOR(w
ord
, l, s, ":", state) {
+ if (l == 8 && strneq(w
ord
, "shutdown", l))
what |= INHIBIT_SHUTDOWN;
what |= INHIBIT_SHUTDOWN;
- else if (l == 5 && strneq(w, "sleep", l))
+ else if (l == 5 && strneq(w
ord
, "sleep", l))
what |= INHIBIT_SLEEP;
what |= INHIBIT_SLEEP;
- else if (l == 4 && strneq(w, "idle", l))
+ else if (l == 4 && strneq(w
ord
, "idle", l))
what |= INHIBIT_IDLE;
what |= INHIBIT_IDLE;
- else if (l == 16 && strneq(w, "handle-power-key", l))
+ else if (l == 16 && strneq(w
ord
, "handle-power-key", l))
what |= INHIBIT_HANDLE_POWER_KEY;
what |= INHIBIT_HANDLE_POWER_KEY;
- else if (l == 18 && strneq(w, "handle-suspend-key", l))
+ else if (l == 18 && strneq(w
ord
, "handle-suspend-key", l))
what |= INHIBIT_HANDLE_SUSPEND_KEY;
what |= INHIBIT_HANDLE_SUSPEND_KEY;
- else if (l == 20 && strneq(w, "handle-hibernate-key", l))
+ else if (l == 20 && strneq(w
ord
, "handle-hibernate-key", l))
what |= INHIBIT_HANDLE_HIBERNATE_KEY;
what |= INHIBIT_HANDLE_HIBERNATE_KEY;
- else if (l == 17 && strneq(w, "handle-lid-switch", l))
+ else if (l == 17 && strneq(w
ord
, "handle-lid-switch", l))
what |= INHIBIT_HANDLE_LID_SWITCH;
else
return _INHIBIT_WHAT_INVALID;
what |= INHIBIT_HANDLE_LID_SWITCH;
else
return _INHIBIT_WHAT_INVALID;