X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=96a9fa5ee14e0378ab643c8b29790f29cfddeaf7;hp=8fc37c55f3a8510a82c5358c4ac6eed7d1645d20;hb=6b01f1d3911bd7c7eadbb8a3b4375bd3ac05c98f;hpb=b91a3b02f3be899dd8a2ae22df5be8de78f5a175

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 8fc37c55f..96a9fa5ee 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -85,10 +85,6 @@ static void pager_open_if_enabled(void) {
         pager_open(false);
 }
 
-static inline const char* arrow(void) {
-        return is_locale_utf8() ? "→" : "->";
-}
-
 static int equivalent(const char *a, const char *b) {
         _cleanup_free_ char *x = NULL, *y = NULL;
 
@@ -109,7 +105,7 @@ static int notify_override_masked(const char *top, const char *bottom) {
 
         printf("%s%s%s     %s %s %s\n",
                ansi_highlight_red(), "[MASKED]", ansi_highlight_off(),
-               top, arrow(), bottom);
+               top, draw_special_char(DRAW_ARROW), bottom);
         return 1;
 }
 
@@ -119,7 +115,7 @@ static int notify_override_equivalent(const char *top, const char *bottom) {
 
         printf("%s%s%s %s %s %s\n",
                ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(),
-               top, arrow(), bottom);
+               top, draw_special_char(DRAW_ARROW), bottom);
         return 1;
 }
 
@@ -129,7 +125,7 @@ static int notify_override_redirected(const char *top, const char *bottom) {
 
         printf("%s%s%s   %s %s %s\n",
                ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
-               top, arrow(), bottom);
+               top, draw_special_char(DRAW_ARROW), bottom);
         return 1;
 }
 
@@ -139,7 +135,7 @@ static int notify_override_overridden(const char *top, const char *bottom) {
 
         printf("%s%s%s %s %s %s\n",
                ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(),
-               top, arrow(), bottom);
+               top, draw_special_char(DRAW_ARROW), bottom);
         return 1;
 }
 
@@ -149,7 +145,7 @@ static int notify_override_extended(const char *top, const char *bottom) {
 
         printf("%s%s%s   %s %s %s\n",
                ansi_highlight(), "[EXTENDED]", ansi_highlight_off(),
-               top, arrow(), bottom);
+               top, draw_special_char(DRAW_ARROW), bottom);
         return 1;
 }
 
@@ -250,7 +246,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
                         return -ENOMEM;
                 d = p + strlen(toppath) + 1;
 
-                log_debug("Adding at top: %s %s %s", d, arrow(), p);
+                log_debug("Adding at top: %s %s %s", d, draw_special_char(DRAW_ARROW), p);
                 k = hashmap_put(top, d, p);
                 if (k >= 0) {
                         p = strdup(p);
@@ -262,7 +258,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
                         return k;
                 }
 
-                log_debug("Adding at bottom: %s %s %s", d, arrow(), p);
+                log_debug("Adding at bottom: %s %s %s", d, draw_special_char(DRAW_ARROW), p);
                 free(hashmap_remove(bottom, d));
                 k = hashmap_put(bottom, d, p);
                 if (k < 0) {
@@ -286,7 +282,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
                         return -ENOMEM;
 
                 log_debug("Adding to drops: %s %s %s %s %s",
-                          unit, arrow(), basename(p), arrow(), p);
+                          unit, draw_special_char(DRAW_ARROW), basename(p), draw_special_char(DRAW_ARROW), p);
                 k = hashmap_put(h, basename(p), p);
                 if (k < 0) {
                         free(p);
@@ -338,7 +334,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
                 if (!p)
                         return -ENOMEM;
 
-                log_debug("Adding at top: %s %s %s", basename(p), arrow(), p);
+                log_debug("Adding at top: %s %s %s", basename(p), draw_special_char(DRAW_ARROW), p);
                 k = hashmap_put(top, basename(p), p);
                 if (k >= 0) {
                         p = strdup(p);
@@ -349,7 +345,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
                         return k;
                 }
 
-                log_debug("Adding at bottom: %s %s %s", basename(p), arrow(), p);
+                log_debug("Adding at bottom: %s %s %s", basename(p), draw_special_char(DRAW_ARROW), p);
                 free(hashmap_remove(bottom, basename(p)));
                 k = hashmap_put(bottom, basename(p), p);
                 if (k < 0) {