chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v234: Check against TRANSPORT_LOCAL in check_inhibitors()
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index a8328592fcfd83c4911d0eacca906dfce9533c3d..896fd570a5b6eabd8b6e58e20b6efca009a4c8cb 100644
(file)
--- a/
src/login/inhibit.c
+++ b/
src/login/inhibit.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-31,7
+29,7
@@
#include "bus-error.h"
#include "bus-util.h"
#include "fd-util.h"
#include "bus-error.h"
#include "bus-util.h"
#include "fd-util.h"
-#include "format
s
-util.h"
+#include "format-util.h"
#include "process-util.h"
#include "signal-util.h"
#include "strv.h"
#include "process-util.h"
#include "signal-util.h"
#include "strv.h"
@@
-52,7
+50,7
@@
static enum {
} arg_action = ACTION_INHIBIT;
static int inhibit(sd_bus *bus, sd_bus_error *error) {
} arg_action = ACTION_INHIBIT;
static int inhibit(sd_bus *bus, sd_bus_error *error) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
int r;
int fd;
int r;
int fd;
@@
-80,7
+78,7
@@
static int inhibit(sd_bus *bus, sd_bus_error *error) {
}
static int print_inhibitors(sd_bus *bus, sd_bus_error *error) {
}
static int print_inhibitors(sd_bus *bus, sd_bus_error *error) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
const char *what, *who, *why, *mode;
unsigned int uid, pid;
unsigned n = 0;
const char *what, *who, *why, *mode;
unsigned int uid, pid;
unsigned n = 0;
@@
-226,8
+224,8
@@
static int parse_argv(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_
bus_flush_close_unref_
sd_bus *bus = NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_flush_close_unrefp)
sd_bus *bus = NULL;
int r;
elogind_set_program_name(argv[0]);
int r;
elogind_set_program_name(argv[0]);