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

shared/install: rename 'UnitFileInstallInfo' to 'InstallInfo'

Browse Source 
- shorter is better
- name now matches the defining-file name

I was also considering UnitInstallInfo. Can change if people prefer that.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-10-13 19:44:47 +02:00
parent 1308f72e83
commit 0047d54d42
6 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-install-root.c
+3 -3
View File
@@ -1080,12 +1080,12 @@ TEST(preset_multiple_instances) {
}
static void verify_one(
const UnitFileInstallInfo *i,
const InstallInfo *i,
const char *alias,
int expected,
const char *updated_name) {
int r;
static const UnitFileInstallInfo *last_info = NULL;
static const InstallInfo *last_info = NULL;
_cleanup_free_ char *alias2 = NULL;
if (i != last_info)
@@ -1106,7 +1106,7 @@ static void verify_one(
}
TEST(verify_alias) {
const UnitFileInstallInfo
const InstallInfo
plain_service = { .name = (char*) "plain.service" },
bare_template = { .name = (char*) "template1@.service" },
di_template = { .name = (char*) "template2@.service",
src/test/test-load-fragment.c
+4 -4
View File
@@ -509,12 +509,12 @@ TEST(config_parse_log_extra_fields) {
TEST(install_printf, .sd_booted = true) {
char name[] = "name.service",
path[] = "/run/systemd/system/name.service";
UnitFileInstallInfo i = { .name = name, .path = path, };
UnitFileInstallInfo i2 = { .name= name, .path = path, };
InstallInfo i = { .name = name, .path = path, };
InstallInfo i2 = { .name= name, .path = path, };
char name3[] = "name@inst.service",
path3[] = "/run/systemd/system/name.service";
UnitFileInstallInfo i3 = { .name = name3, .path = path3, };
UnitFileInstallInfo i4 = { .name = name3, .path = path3, };
InstallInfo i3 = { .name = name3, .path = path3, };
InstallInfo i4 = { .name = name3, .path = path3, };
_cleanup_free_ char *mid = NULL, *bid = NULL, *host = NULL, *gid = NULL, *group = NULL, *uid = NULL, *user = NULL;