chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: rename sd_bus_open_system_container() to sd_bus_open_system_machine()
[elogind.git]
/
src
/
login
/
loginctl.c
diff --git
a/src/login/loginctl.c
b/src/login/loginctl.c
index 1773276b95c85ac7d3c0829612b92dc6466cac6c..03abb7594f1ca952a0662f222aa04465ab2505a3 100644
(file)
--- a/
src/login/loginctl.c
+++ b/
src/login/loginctl.c
@@
-384,10
+384,8
@@
static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
int r;
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
int r;
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
- if (r < 0) {
- log_error("Could not get properties: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Could not get properties: %m");
if (*new_line)
printf("\n");
if (*new_line)
printf("\n");
@@
-425,7
+423,7
@@
static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
printf("\t Seat: %s", i.seat);
if (i.vtnr > 0)
printf("\t Seat: %s", i.seat);
if (i.vtnr > 0)
- printf("; vc%
i
", i.vtnr);
+ printf("; vc%
u
", i.vtnr);
printf("\n");
}
printf("\n");
}
@@
-498,7
+496,7
@@
static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
- log_error
("Could not get properties: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not get properties: %m"
);
goto finish;
}
goto finish;
}
@@
-562,7
+560,7
@@
static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line)
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
if (r < 0) {
- log_error
("Could not get properties: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not get properties: %m"
);
goto finish;
}
goto finish;
}
@@
-617,7
+615,7
@@
static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all);
if (r < 0)
r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all);
if (r < 0)
- log_error
("Could not get properties: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not get properties: %m"
);
return r;
}
return r;
}
@@
-699,10
+697,8
@@
static int show_user(sd_bus *bus, char **args, unsigned n) {
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
- if (r < 0) {
- log_error("Failed to look up user %s: %s", args[i], strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
r = sd_bus_call_method(
bus,
r = sd_bus_call_method(
bus,
@@
-859,10
+855,8
@@
static int enable_linger(sd_bus *bus, char **args, unsigned n) {
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
- if (r < 0) {
- log_error("Failed to look up user %s: %s", args[i], strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
r = sd_bus_call_method (
bus,
r = sd_bus_call_method (
bus,
@@
-892,10
+886,8
@@
static int terminate_user(sd_bus *bus, char **args, unsigned n) {
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
- if (r < 0) {
- log_error("Failed to look up user %s: %s", args[i], strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
r = sd_bus_call_method (
bus,
r = sd_bus_call_method (
bus,
@@
-928,10
+920,8
@@
static int kill_user(sd_bus *bus, char **args, unsigned n) {
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
uid_t uid;
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
- if (r < 0) {
- log_error("Failed to look up user %s: %s", args[i], strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
r = sd_bus_call_method (
bus,
r = sd_bus_call_method (
bus,
@@
-1183,7
+1173,7
@@
static int parse_argv(int argc, char *argv[]) {
break;
case 'M':
break;
case 'M':
- arg_transport = BUS_TRANSPORT_
CONTAINER
;
+ arg_transport = BUS_TRANSPORT_
MACHINE
;
arg_host = optarg;
break;
arg_host = optarg;
break;
@@
-1295,7
+1285,7
@@
static int loginctl_main(sd_bus *bus, int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_
close_
unref_ sd_bus *bus = NULL;
int r;
setlocale(LC_ALL, "");
int r;
setlocale(LC_ALL, "");
@@
-1308,7
+1298,7
@@
int main(int argc, char *argv[]) {
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error
("Failed to create bus connection: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create bus connection: %m"
);
goto finish;
}
goto finish;
}