diff options
Diffstat (limited to 'src/login/logind-core.c')
| -rw-r--r-- | src/login/logind-core.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 2bab2fd2f5..60831bb1c3 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -606,9 +606,8 @@ static int manager_count_external_displays(Manager *m) { return r; FOREACH_DEVICE(e, d) { + const char *status, *enabled, *dash, *nn, *subsys; sd_device *p; - const char *status, *enabled, *dash, *nn, *i, *subsys; - bool external = false; if (sd_device_get_parent(d, &p) < 0) continue; @@ -631,16 +630,10 @@ static int manager_count_external_displays(Manager *m) { continue; dash++; - FOREACH_STRING(i, "VGA-", "DVI-I-", "DVI-D-", "DVI-A-" - "Composite-", "SVIDEO-", "Component-", - "DIN-", "DP-", "HDMI-A-", "HDMI-B-", "TV-") { - - if (startswith(dash, i)) { - external = true; - break; - } - } - if (!external) + if (!STARTSWITH_SET(dash, + "VGA-", "DVI-I-", "DVI-D-", "DVI-A-" + "Composite-", "SVIDEO-", "Component-", + "DIN-", "DP-", "HDMI-A-", "HDMI-B-", "TV-")) continue; /* Ignore ports that are not enabled */ |