From eeb6923d5ae68cb9d8e210dab2e5a0b61dfd28c1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 8 Apr 2021 23:01:25 +0200 Subject: [PATCH] core: rework unit_active_state_to_glyph() to use a translation table Let's make this a bit more readable by implementing this via a translation table, indexed by the state. --- src/basic/unit-def.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c index 6fbb947f096..5cfabca83fb 100644 --- a/src/basic/unit-def.c +++ b/src/basic/unit-def.c @@ -296,22 +296,19 @@ static const char* const notify_access_table[_NOTIFY_ACCESS_MAX] = { DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess); SpecialGlyph unit_active_state_to_glyph(UnitActiveState state) { - switch (state) { - case UNIT_ACTIVE: - return SPECIAL_GLYPH_BLACK_CIRCLE; - case UNIT_RELOADING: - return SPECIAL_GLYPH_CIRCLE_ARROW; - case UNIT_INACTIVE: - return SPECIAL_GLYPH_WHITE_CIRCLE; - case UNIT_FAILED: - return SPECIAL_GLYPH_MULTIPLICATION_SIGN; - case UNIT_ACTIVATING: - case UNIT_DEACTIVATING: - return SPECIAL_GLYPH_BLACK_CIRCLE; - case UNIT_MAINTENANCE: - return SPECIAL_GLYPH_WHITE_CIRCLE; - - default: - return SPECIAL_GLYPH_BLACK_CIRCLE; - } + static const SpecialGlyph map[_UNIT_ACTIVE_STATE_MAX] = { + [UNIT_ACTIVE] = SPECIAL_GLYPH_BLACK_CIRCLE, + [UNIT_RELOADING] = SPECIAL_GLYPH_CIRCLE_ARROW, + [UNIT_INACTIVE] = SPECIAL_GLYPH_WHITE_CIRCLE, + [UNIT_FAILED] = SPECIAL_GLYPH_MULTIPLICATION_SIGN, + [UNIT_ACTIVATING] = SPECIAL_GLYPH_BLACK_CIRCLE, + [UNIT_DEACTIVATING] = SPECIAL_GLYPH_BLACK_CIRCLE, + [UNIT_MAINTENANCE] = SPECIAL_GLYPH_WHITE_CIRCLE, + }; + + if (state < 0) + return _SPECIAL_GLYPH_INVALID; + + assert(state < _UNIT_ACTIVE_STATE_MAX); + return map[state]; } -- 2.47.3