chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
__thread --> thread_local for C11 compat
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 3bc4642071dc09745f8560b7206c6634479bc88b..042586d0738c9268ae54bc8ce07a04c0b3465293 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);
@@
-305,7
+304,7
@@
int inhibitor_create_fifo(Inhibitor *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;
}
@@
-373,7
+372,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
+401,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
+413,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)