chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 3bc4642071dc09745f8560b7206c6634479bc88b..198e7df78c22b510c30e10abcda2c4d693a476f6 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-22,7
+22,6
@@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <string.h>
-#include <errno.h>
#include <unistd.h>
#include "util.h"
#include <unistd.h>
#include "util.h"
@@
-46,7
+45,7
@@
Inhibitor* inhibitor_new(Manager *m, const char* id) {
return NULL;
}
return NULL;
}
- i->id =
path_get_file_
name(i->state_file);
+ i->id =
base
name(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
@@
-99,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;
@@
-139,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
_errno(-r, "Failed to save inhibit data %s: %m", i->state_file
);
return r;
}
return r;
}
@@
-152,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);
@@
-170,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)
@@
-254,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;
@@
-301,11
+299,11
@@
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;
- r = sd_event_source_set_priority(i->event_source, SD_PRIORITY_IDLE);
+ r = sd_event_source_set_priority(i->event_source, SD_
EVENT_
PRIORITY_IDLE);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-321,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);
@@
-373,7
+366,8
@@
bool manager_is_inhibited(
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
- uid_t uid) {
+ uid_t uid,
+ Inhibitor **offending) {
Inhibitor *i;
Iterator j;
Inhibitor *i;
Iterator j;
@@
-401,6
+395,9
@@
bool manager_is_inhibited(
ts = i->since;
inhibited = true;
ts = i->since;
inhibited = true;
+
+ if (offending)
+ *offending = i;
}
if (since)
}
if (since)
@@
-410,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)
@@
-442,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;