return NULL;
}
- i->id = path_get_file_name(i->state_file);
+ i->id = basename(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
"# 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),
- (unsigned long) i->uid,
- (unsigned long) i->pid);
+ i->uid,
+ i->pid);
if (i->who) {
_cleanup_free_ char *cc = NULL;
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;
}
}
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;
- 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;
}
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
- uid_t uid) {
+ uid_t uid,
+ Inhibitor **offending) {
Inhibitor *i;
Iterator j;
ts = i->since;
inhibited = true;
+
+ if (offending)
+ *offending = i;
}
if (since)
}
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)