Merge pull request #11827 from keszybz/pkgconfig-variables

[thirdparty/systemd.git] / src / basic / locale-util.c

diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index cf4d22fbce45644c1be3b7edba120b1ff0842f37..fc1577a83f666e5e5f0847a353fcc798fb8024c2 100644 (file)
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -378,50 +378,50 @@ const char *special_glyph(SpecialGlyph code) {
         static const char* const draw_table[2][_SPECIAL_GLYPH_MAX] = {
                 /* ASCII fallback */
                 [false] = {
-                        [TREE_VERTICAL]           = "| ",
-                        [TREE_BRANCH]             = "|-",
-                        [TREE_RIGHT]              = "`-",
-                        [TREE_SPACE]              = "  ",
-                        [TRIANGULAR_BULLET]       = ">",
-                        [BLACK_CIRCLE]            = "*",
-                        [BULLET]                  = "*",
-                        [ARROW]                   = "->",
-                        [MDASH]                   = "-",
-                        [ELLIPSIS]                = "...",
-                        [MU]                      = "u",
-                        [CHECK_MARK]              = "+",
-                        [CROSS_MARK]              = "-",
-                        [ECSTATIC_SMILEY]         = ":-]",
-                        [HAPPY_SMILEY]            = ":-}",
-                        [SLIGHTLY_HAPPY_SMILEY]   = ":-)",
-                        [NEUTRAL_SMILEY]          = ":-|",
-                        [SLIGHTLY_UNHAPPY_SMILEY] = ":-(",
-                        [UNHAPPY_SMILEY]          = ":-{️",
-                        [DEPRESSED_SMILEY]        = ":-[",
+                        [SPECIAL_GLYPH_TREE_VERTICAL]           = "| ",
+                        [SPECIAL_GLYPH_TREE_BRANCH]             = "|-",
+                        [SPECIAL_GLYPH_TREE_RIGHT]              = "`-",
+                        [SPECIAL_GLYPH_TREE_SPACE]              = "  ",
+                        [SPECIAL_GLYPH_TRIANGULAR_BULLET]       = ">",
+                        [SPECIAL_GLYPH_BLACK_CIRCLE]            = "*",
+                        [SPECIAL_GLYPH_BULLET]                  = "*",
+                        [SPECIAL_GLYPH_ARROW]                   = "->",
+                        [SPECIAL_GLYPH_MDASH]                   = "-",
+                        [SPECIAL_GLYPH_ELLIPSIS]                = "...",
+                        [SPECIAL_GLYPH_MU]                      = "u",
+                        [SPECIAL_GLYPH_CHECK_MARK]              = "+",
+                        [SPECIAL_GLYPH_CROSS_MARK]              = "-",
+                        [SPECIAL_GLYPH_ECSTATIC_SMILEY]         = ":-]",
+                        [SPECIAL_GLYPH_HAPPY_SMILEY]            = ":-}",
+                        [SPECIAL_GLYPH_SLIGHTLY_HAPPY_SMILEY]   = ":-)",
+                        [SPECIAL_GLYPH_NEUTRAL_SMILEY]          = ":-|",
+                        [SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY] = ":-(",
+                        [SPECIAL_GLYPH_UNHAPPY_SMILEY]          = ":-{️",
+                        [SPECIAL_GLYPH_DEPRESSED_SMILEY]        = ":-[",
                 },
 
                 /* UTF-8 */
                 [true] = {
-                        [TREE_VERTICAL]           = "\342\224\202 ",            /* │  */
-                        [TREE_BRANCH]             = "\342\224\234\342\224\200", /* ├─ */
-                        [TREE_RIGHT]              = "\342\224\224\342\224\200", /* └─ */
-                        [TREE_SPACE]              = "  ",                       /*    */
-                        [TRIANGULAR_BULLET]       = "\342\200\243",             /* ‣ */
-                        [BLACK_CIRCLE]            = "\342\227\217",             /* ● */
-                        [BULLET]                  = "\342\200\242",             /* • */
-                        [ARROW]                   = "\342\206\222",             /* → */
-                        [MDASH]                   = "\342\200\223",             /* – */
-                        [ELLIPSIS]                = "\342\200\246",             /* … */
-                        [MU]                      = "\316\274",                 /* μ */
-                        [CHECK_MARK]              = "\342\234\223",             /* ✓ */
-                        [CROSS_MARK]              = "\342\234\227",             /* ✗ */
-                        [ECSTATIC_SMILEY]         = "\360\237\230\207",         /* 😇 */
-                        [HAPPY_SMILEY]            = "\360\237\230\200",         /* 😀 */
-                        [SLIGHTLY_HAPPY_SMILEY]   = "\360\237\231\202",         /* 🙂 */
-                        [NEUTRAL_SMILEY]          = "\360\237\230\220",         /* 😐 */
-                        [SLIGHTLY_UNHAPPY_SMILEY] = "\360\237\231\201",         /* 🙁 */
-                        [UNHAPPY_SMILEY]          = "\360\237\230\250",         /* 😨️️ */
-                        [DEPRESSED_SMILEY]        = "\360\237\244\242",         /* 🤢 */
+                        [SPECIAL_GLYPH_TREE_VERTICAL]           = "\342\224\202 ",            /* │  */
+                        [SPECIAL_GLYPH_TREE_BRANCH]             = "\342\224\234\342\224\200", /* ├─ */
+                        [SPECIAL_GLYPH_TREE_RIGHT]              = "\342\224\224\342\224\200", /* └─ */
+                        [SPECIAL_GLYPH_TREE_SPACE]              = "  ",                       /*    */
+                        [SPECIAL_GLYPH_TRIANGULAR_BULLET]       = "\342\200\243",             /* ‣ */
+                        [SPECIAL_GLYPH_BLACK_CIRCLE]            = "\342\227\217",             /* ● */
+                        [SPECIAL_GLYPH_BULLET]                  = "\342\200\242",             /* • */
+                        [SPECIAL_GLYPH_ARROW]                   = "\342\206\222",             /* → */
+                        [SPECIAL_GLYPH_MDASH]                   = "\342\200\223",             /* – */
+                        [SPECIAL_GLYPH_ELLIPSIS]                = "\342\200\246",             /* … */
+                        [SPECIAL_GLYPH_MU]                      = "\316\274",                 /* μ */
+                        [SPECIAL_GLYPH_CHECK_MARK]              = "\342\234\223",             /* ✓ */
+                        [SPECIAL_GLYPH_CROSS_MARK]              = "\342\234\227",             /* ✗ */
+                        [SPECIAL_GLYPH_ECSTATIC_SMILEY]         = "\360\237\230\207",         /* 😇 */
+                        [SPECIAL_GLYPH_HAPPY_SMILEY]            = "\360\237\230\200",         /* 😀 */
+                        [SPECIAL_GLYPH_SLIGHTLY_HAPPY_SMILEY]   = "\360\237\231\202",         /* 🙂 */
+                        [SPECIAL_GLYPH_NEUTRAL_SMILEY]          = "\360\237\230\220",         /* 😐 */
+                        [SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY] = "\360\237\231\201",         /* 🙁 */
+                        [SPECIAL_GLYPH_UNHAPPY_SMILEY]          = "\360\237\230\250",         /* 😨️️ */
+                        [SPECIAL_GLYPH_DEPRESSED_SMILEY]        = "\360\237\244\242",         /* 🤢 */
                 },
         };