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/sysusers/sysusers.c
+6 -6
View File
@@ -481,7 +481,7 @@ static int write_temporary_passwd(
return 0;
if (arg_dry_run) {
log_info("Would write /etc/passwd%s", special_glyph(SPECIAL_GLYPH_ELLIPSIS));
log_info("Would write /etc/passwd%s", glyph(GLYPH_ELLIPSIS));
return 0;
}
@@ -624,7 +624,7 @@ static int write_temporary_shadow(
return 0;
if (arg_dry_run) {
log_info("Would write /etc/shadow%s", special_glyph(SPECIAL_GLYPH_ELLIPSIS));
log_info("Would write /etc/shadow%s", glyph(GLYPH_ELLIPSIS));
return 0;
}
@@ -759,7 +759,7 @@ static int write_temporary_group(
return 0;
if (arg_dry_run) {
log_info("Would write /etc/group%s", special_glyph(SPECIAL_GLYPH_ELLIPSIS));
log_info("Would write /etc/group%s", glyph(GLYPH_ELLIPSIS));
return 0;
}
@@ -872,7 +872,7 @@ static int write_temporary_gshadow(
return 0;
if (arg_dry_run) {
log_info("Would write /etc/gshadow%s", special_glyph(SPECIAL_GLYPH_ELLIPSIS));
log_info("Would write /etc/gshadow%s", glyph(GLYPH_ELLIPSIS));
return 0;
}
@@ -2224,13 +2224,13 @@ static int read_config_files(Context *c, char **args) {
STRV_FOREACH(f, files)
if (p && path_equal(*f, p)) {
log_debug("Parsing arguments at position \"%s\"%s", *f, special_glyph(SPECIAL_GLYPH_ELLIPSIS));
log_debug("Parsing arguments at position \"%s\"%s", *f, glyph(GLYPH_ELLIPSIS));
r = parse_arguments(c, args);
if (r < 0)
return r;
} else {
log_debug("Reading config file \"%s\"%s", *f, special_glyph(SPECIAL_GLYPH_ELLIPSIS));
log_debug("Reading config file \"%s\"%s", *f, glyph(GLYPH_ELLIPSIS));
/* Just warn, ignore result otherwise */
(void) read_config_file(c, *f, /* ignore_enoent= */ true);