]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
loginctl: shorten variable name
authorDavid Tardon <dtardon@redhat.com>
Tue, 23 May 2023 08:48:15 +0000 (10:48 +0200)
committerDavid Tardon <dtardon@redhat.com>
Tue, 23 May 2023 08:48:15 +0000 (10:48 +0200)
src/login/loginctl.c

index dfc738c6d02ee207e4dbcd31eba5bf72e661342b..505e36174583ea41ff692dcf49f73509f63350a5 100644 (file)
@@ -142,7 +142,7 @@ static int list_sessions(int argc, char *argv[], void *userdata) {
         (void) table_set_align_percent(table, TABLE_HEADER_CELL(1), 100);
 
         for (;;) {
-                _cleanup_(sd_bus_error_free) sd_bus_error error_property = SD_BUS_ERROR_NULL;
+                _cleanup_(sd_bus_error_free) sd_bus_error e = SD_BUS_ERROR_NULL;
                 _cleanup_free_ char *tty = NULL, *state = NULL;
                 const char *id, *user, *seat, *object;
                 uint32_t uid;
@@ -158,17 +158,17 @@ static int list_sessions(int argc, char *argv[], void *userdata) {
                                                object,
                                                "org.freedesktop.login1.Session",
                                                "TTY",
-                                               &error_property,
+                                               &e,
                                                &tty);
                 if (r < 0) {
-                        if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT))
+                        if (sd_bus_error_has_name(&e, SD_BUS_ERROR_UNKNOWN_OBJECT))
                                 /* The session is already closed when we're querying the property */
                                 continue;
 
                         log_warning_errno(r, "Failed to get TTY for session %s, ignoring: %s",
-                                          id, bus_error_message(&error_property, r));
+                                          id, bus_error_message(&e, r));
 
-                        sd_bus_error_free(&error_property);
+                        sd_bus_error_free(&e);
                 }
 
                 r = sd_bus_get_property_string(bus,
@@ -176,15 +176,15 @@ static int list_sessions(int argc, char *argv[], void *userdata) {
                                                object,
                                                "org.freedesktop.login1.Session",
                                                "State",
-                                               &error_property,
+                                               &e,
                                                &state);
                 if (r < 0) {
-                        if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT))
+                        if (sd_bus_error_has_name(&e, SD_BUS_ERROR_UNKNOWN_OBJECT))
                                 /* The session is already closed when we're querying the property */
                                 continue;
 
                         return log_error_errno(r, "Failed to get state for session %s: %s",
-                                               id, bus_error_message(&error_property, r));
+                                               id, bus_error_message(&e, r));
                 }
 
                 r = table_add_many(table,