diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-09-01 23:13:54 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-09-23 17:18:50 +0900 |
| commit | c679e12af1f2985c4ab4346db8e53ca14f4cc626 (patch) | |
| tree | a3e7c97c62887c169c78c708abf3d06d01a25c3f /src/login/sysfs-show.c | |
| parent | 2c740afd1613a7ab5e70e39251767a3429c543cc (diff) | |
| download | systemd-c679e12af1f2985c4ab4346db8e53ca14f4cc626.tar.gz | |
tree-wide: drop unnecessary initializations
Diffstat (limited to 'src/login/sysfs-show.c')
| -rw-r--r-- | src/login/sysfs-show.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index 758f9c2c1d..192c95107b 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -40,7 +40,7 @@ static int show_sysfs_one( max_width = n_columns; while (*i_dev < n_dev) { - const char *sysfs, *sn, *name = NULL, *subsystem = NULL, *sysname = NULL; + const char *sysfs, *sn, *name = NULL, *subsystem, *sysname; _cleanup_free_ char *k = NULL, *l = NULL; size_t lookahead; bool is_master; @@ -53,7 +53,10 @@ static int show_sysfs_one( sn = "seat0"; /* Explicitly also check for tag 'seat' here */ - if (!streq(seat, sn) || sd_device_has_tag(dev_list[*i_dev], "seat") <= 0) { + if (!streq(seat, sn) || + sd_device_has_tag(dev_list[*i_dev], "seat") <= 0 || + sd_device_get_subsystem(dev_list[*i_dev], &subsystem) < 0 || + sd_device_get_sysname(dev_list[*i_dev], &sysname) < 0) { (*i_dev)++; continue; } @@ -63,9 +66,6 @@ static int show_sysfs_one( if (sd_device_get_sysattr_value(dev_list[*i_dev], "name", &name) < 0) (void) sd_device_get_sysattr_value(dev_list[*i_dev], "id", &name); - (void) sd_device_get_subsystem(dev_list[*i_dev], &subsystem); - (void) sd_device_get_sysname(dev_list[*i_dev], &sysname); - /* Look if there's more coming after this */ for (lookahead = *i_dev + 1; lookahead < n_dev; lookahead++) { const char *lookahead_sysfs; |