SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic/glyph-util: rename "special glyph" to just "glyph"

Browse Source 
Admittedly, some of our glyphs _are_ special, e.g. "O=" for SPECIAL_GLYPH_TOUCH ;)
But we don't need this in the name. The very long names make some invocations
very wordy, e.g. special_glyph(SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY).
Also, I want to add GLYPH_SPACE, which is not special at all.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-03-15 14:40:39 +01:00
parent 32f66088de
commit 1ae9b0cfa8
107 changed files with 544 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/unit-def.c
+11 -11
View File
@@ -358,20 +358,20 @@ static const char* const job_mode_table[_JOB_MODE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode);
SpecialGlyph unit_active_state_to_glyph(UnitActiveState state) {
static const SpecialGlyph map[_UNIT_ACTIVE_STATE_MAX] = {
[UNIT_ACTIVE] = SPECIAL_GLYPH_BLACK_CIRCLE,
[UNIT_RELOADING] = SPECIAL_GLYPH_CIRCLE_ARROW,
[UNIT_REFRESHING] = 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,
Glyph unit_active_state_to_glyph(UnitActiveState state) {
static const Glyph map[_UNIT_ACTIVE_STATE_MAX] = {
[UNIT_ACTIVE] = GLYPH_BLACK_CIRCLE,
[UNIT_RELOADING] = GLYPH_CIRCLE_ARROW,
[UNIT_REFRESHING] = GLYPH_CIRCLE_ARROW,
[UNIT_INACTIVE] = GLYPH_WHITE_CIRCLE,
[UNIT_FAILED] = GLYPH_MULTIPLICATION_SIGN,
[UNIT_ACTIVATING] = GLYPH_BLACK_CIRCLE,
[UNIT_DEACTIVATING] = GLYPH_BLACK_CIRCLE,
[UNIT_MAINTENANCE] = GLYPH_WHITE_CIRCLE,
};
if (state < 0)
return _SPECIAL_GLYPH_INVALID;
return _GLYPH_INVALID;
assert(state < _UNIT_ACTIVE_STATE_MAX);
return map[state];