diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-12-13 22:11:32 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-14 08:22:54 +0100 |
| commit | 9a6f746fb6e21dc4fe79ed93dde8b79371a13d34 (patch) | |
| tree | 3893a2ce756b0326fd463a7d7244d2ad82a4f6fb /src/portable | |
| parent | fd0ec39d3848029abd3a439e84c5728331de2128 (diff) | |
| download | systemd-9a6f746fb6e21dc4fe79ed93dde8b79371a13d34.tar.gz | |
locale-util: prefix special glyph enum values with SPECIAL_GLYPH_
This has been irritating me for quite a while: let's prefix these enum
values with a common prefix, like we do for almost all other enums.
No change in behaviour, just some renaming.
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/portable.c | 6 | ||||
| -rw-r--r-- | src/portable/portablectl.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/portable/portable.c b/src/portable/portable.c index 920bd866f5..01fd1a94a0 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -786,14 +786,14 @@ static int install_profile_dropin( r = copy_file_atomic(from, dropin, 0644, 0, COPY_REFLINK); if (r < 0) - return log_debug_errno(r, "Failed to copy %s %s %s: %m", from, special_glyph(ARROW), dropin); + return log_debug_errno(r, "Failed to copy %s %s %s: %m", from, special_glyph(SPECIAL_GLYPH_ARROW), dropin); (void) portable_changes_add(changes, n_changes, PORTABLE_COPY, dropin, from); } else { if (symlink(from, dropin) < 0) - return log_debug_errno(errno, "Failed to link %s %s %s: %m", from, special_glyph(ARROW), dropin); + return log_debug_errno(errno, "Failed to link %s %s %s: %m", from, special_glyph(SPECIAL_GLYPH_ARROW), dropin); (void) portable_changes_add(changes, n_changes, PORTABLE_SYMLINK, dropin, from); } @@ -959,7 +959,7 @@ static int install_image_symlink( (void) mkdir_parents(sl, 0755); if (symlink(image_path, sl) < 0) - return log_debug_errno(errno, "Failed to link %s %s %s: %m", image_path, special_glyph(ARROW), sl); + return log_debug_errno(errno, "Failed to link %s %s %s: %m", image_path, special_glyph(SPECIAL_GLYPH_ARROW), sl); (void) portable_changes_add(changes, n_changes, PORTABLE_SYMLINK, sl, image_path); return 0; diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c index 4763c0d7d0..bb6cebdf16 100644 --- a/src/portable/portablectl.c +++ b/src/portable/portablectl.c @@ -365,12 +365,12 @@ static int print_changes(sd_bus_message *m) { break; if (streq(type, "symlink")) - log_info("Created symlink %s %s %s.", path, special_glyph(ARROW), source); + log_info("Created symlink %s %s %s.", path, special_glyph(SPECIAL_GLYPH_ARROW), source); else if (streq(type, "copy")) { if (isempty(source)) log_info("Copied %s.", path); else - log_info("Copied %s %s %s.", source, special_glyph(ARROW), path); + log_info("Copied %s %s %s.", source, special_glyph(SPECIAL_GLYPH_ARROW), path); } else if (streq(type, "unlink")) log_info("Removed %s.", path); else if (streq(type, "write")) |