chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: consistently use "?*" instead of "*?"
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index ec6a722ce3e65ed7b1517c7d65098d249aaad7b6..64a62ffeae6f51b0f3f86aed4e39aa6275621006 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-98,12
+98,12
@@
int inhibitor_save(Inhibitor *i) {
"# This is private data. Do not parse.\n"
"WHAT=%s\n"
"MODE=%s\n"
"# This is private data. Do not parse.\n"
"WHAT=%s\n"
"MODE=%s\n"
- "UID=
%lu
\n"
- "PID=
%lu
\n",
+ "UID=
"UID_FMT"
\n"
+ "PID=
"PID_FMT"
\n",
inhibit_what_to_string(i->what),
inhibit_mode_to_string(i->mode),
inhibit_what_to_string(i->what),
inhibit_mode_to_string(i->mode),
-
(unsigned long)
i->uid,
-
(unsigned long)
i->pid);
+ i->uid,
+ i->pid);
if (i->who) {
_cleanup_free_ char *cc = NULL;
if (i->who) {
_cleanup_free_ char *cc = NULL;
@@
-138,7
+138,7
@@
int inhibitor_save(Inhibitor *i) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error("Failed to save inhibit data
for %s: %s", i->id
, strerror(-r));
+ log_error("Failed to save inhibit data
%s: %s", i->state_file
, strerror(-r));
return r;
}
return r;
}
@@
-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;
@@
-300,7
+299,7
@@
int inhibitor_create_fifo(Inhibitor *i) {
}
if (!i->event_source) {
}
if (!i->event_source) {
- r = sd_event_add_io(i->manager->event,
i->fifo_fd, 0, inhibitor_dispatch_fifo, i, &i->event_source
);
+ r = sd_event_add_io(i->manager->event,
&i->event_source, i->fifo_fd, 0, inhibitor_dispatch_fifo, i
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-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);
@@
-413,7
+407,7
@@
bool manager_is_inhibited(
}
const char *inhibit_what_to_string(InhibitWhat w) {
}
const char *inhibit_what_to_string(InhibitWhat w) {
- static
__thread
char buffer[97];
+ static
thread_local
char buffer[97];
char *p;
if (w < 0 || w >= _INHIBIT_WHAT_MAX)
char *p;
if (w < 0 || w >= _INHIBIT_WHAT_MAX)