strv: make iterator in STRV_FOREACH() declaread in the loop

[thirdparty/systemd.git] / src / login / loginctl.c

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 6f06ffdc9c115cf742f15ee29319cab70237db55..83f25135a2e68e1c9ef385ef748001a4ba38f456 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -469,7 +469,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
         else
                 printf("%"PRIu32"\n", i.uid);
 
-        if (i.timestamp.realtime > 0 && i.timestamp.realtime < USEC_INFINITY)
+        if (timestamp_is_set(i.timestamp.realtime))
                 printf("\t   Since: %s; %s\n",
                        FORMAT_TIMESTAMP(i.timestamp.realtime),
                        FORMAT_TIMESTAMP_RELATIVE(i.timestamp.realtime));
@@ -592,7 +592,7 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
         else
                 printf("%"PRIu32"\n", i.uid);
 
-        if (i.timestamp.realtime > 0 && i.timestamp.realtime < USEC_INFINITY)
+        if (timestamp_is_set(i.timestamp.realtime))
                 printf("\t   Since: %s; %s\n",
                        FORMAT_TIMESTAMP(i.timestamp.realtime),
                        FORMAT_TIMESTAMP_RELATIVE(i.timestamp.realtime));
@@ -601,7 +601,6 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
                 printf("\t   State: %s\n", i.state);
 
         if (!strv_isempty(i.sessions)) {
-                char **l;
                 printf("\tSessions:");
 
                 STRV_FOREACH(l, i.sessions)
@@ -662,7 +661,6 @@ static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line)
         printf("%s\n", strna(i.id));
 
         if (!strv_isempty(i.sessions)) {
-                char **l;
                 printf("\tSessions:");
 
                 STRV_FOREACH(l, i.sessions) {
@@ -1468,7 +1466,7 @@ static int run(int argc, char *argv[]) {
 
         r = bus_connect_transport(arg_transport, arg_host, false, &bus);
         if (r < 0)
-                return bus_log_connect_error(r);
+                return bus_log_connect_error(r, arg_transport);
 
         (void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);