diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-05-28 09:28:28 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-05-28 23:54:35 +0200 |
| commit | ccdf03b9c72bada6a9da49ce3597ed5eac88cab8 (patch) | |
| tree | e2e0ae329a808eb5c672e99e9d8ccdbfb319aae4 /man/sd_path_lookup.xml | |
| parent | 4a56315a990b802860170ecd1bbd3eb68e14a38b (diff) | |
| download | systemd-ccdf03b9c72bada6a9da49ce3597ed5eac88cab8.tar.gz | |
sd-path: drop "-dir" and "-path" suffixes from path enums
Clean up the naming of the sd-path enums. Previously, the more recently
added fields where named in the form SD_PATH_xyz_DIR and
SD_PATH_xyz_PATH, while the older fields where called just SD_PATH_xyz
and SD_PATH_SEARCH_xyz. Let's clean this up, to come to a more unified
way how we name this stuff.
I opted to stick to the old naming, i.e. dropthe suffixes. It's a bit of
a bike-shedding question of course, but I think there's a good reason to
avoid the additional DIR and PATH suffixes: the enum prefix contains
"PATH" anyway (i.e. "SD_PATH_"), so including PATH twice in each name is
redundant. Moreover, the key difference between the enums with the "dir"
and the "path" in the name is that the latter are *seach* paths, and I
think this is better emphasized by sticking to the "SEARCH" in the name.
Moreover dropping the suffixes makes the identifiers a lot shorter, in
particular in the "systemd-path" list output. And that's always good.
This means the naming pkgconfig file and in sd-path slightly deviate
(though the mapping is very simple), but I think that's OK, given that
this is developer facing and not user facing.
Diffstat (limited to 'man/sd_path_lookup.xml')
| -rw-r--r-- | man/sd_path_lookup.xml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/man/sd_path_lookup.xml b/man/sd_path_lookup.xml index 68c6812ab1..9316090cce 100644 --- a/man/sd_path_lookup.xml +++ b/man/sd_path_lookup.xml @@ -76,30 +76,30 @@ <constant>SD_PATH_SEARCH_STATE_FACTORY</constant>, <constant>SD_PATH_SEARCH_CONFIGURATION</constant>, - <constant>SD_PATH_SYSTEMD_UTIL_DIR</constant>, - <constant>SD_PATH_SYSTEMD_SYSTEM_UNIT_DIR</constant>, - <constant>SD_PATH_SYSTEMD_SYSTEM_PRESET_DIR</constant>, - <constant>SD_PATH_SYSTEMD_USER_UNIT_DIR</constant>, - <constant>SD_PATH_SYSTEMD_USER_PRESET_DIR</constant>, - <constant>SD_PATH_SYSTEMD_SYSTEM_CONF_DIR</constant>, - <constant>SD_PATH_SYSTEMD_USER_CONF_DIR</constant>, - <constant>SD_PATH_SYSTEMD_SYSTEM_UNIT_PATH</constant>, - <constant>SD_PATH_SYSTEMD_USER_UNIT_PATH</constant>, - <constant>SD_PATH_SYSTEMD_SYSTEM_GENERATOR_DIR</constant>, - <constant>SD_PATH_SYSTEMD_USER_GENERATOR_DIR</constant>, - <constant>SD_PATH_SYSTEMD_SYSTEM_GENERATOR_PATH</constant>, - <constant>SD_PATH_SYSTEMD_USER_GENERATOR_PATH</constant>, - <constant>SD_PATH_SYSTEMD_SLEEP_DIR</constant>, - <constant>SD_PATH_SYSTEMD_SHUTDOWN_DIR</constant>, - - <constant>SD_PATH_TMPFILES_DIR</constant>, - <constant>SD_PATH_SYSUSERS_DIR</constant>, - <constant>SD_PATH_SYSCTL_DIR</constant>, - <constant>SD_PATH_BINFMT_DIR</constant>, - <constant>SD_PATH_MODULES_LOAD_DIR</constant>, - <constant>SD_PATH_CATALOG_DIR</constant>, - - <constant>SD_PATH_SYSTEMD_NETWORK_PATH</constant>, + <constant>SD_PATH_SYSTEMD_UTIL</constant>, + <constant>SD_PATH_SYSTEMD_SYSTEM_UNIT</constant>, + <constant>SD_PATH_SYSTEMD_SYSTEM_PRESET</constant>, + <constant>SD_PATH_SYSTEMD_USER_UNIT</constant>, + <constant>SD_PATH_SYSTEMD_USER_PRESET</constant>, + <constant>SD_PATH_SYSTEMD_SYSTEM_CONF</constant>, + <constant>SD_PATH_SYSTEMD_USER_CONF</constant>, + <constant>SD_PATH_SYSTEMD_SEARCH_SYSTEM_UNIT</constant>, + <constant>SD_PATH_SYSTEMD_SEARCH_USER_UNIT</constant>, + <constant>SD_PATH_SYSTEMD_SYSTEM_GENERATOR</constant>, + <constant>SD_PATH_SYSTEMD_USER_GENERATOR</constant>, + <constant>SD_PATH_SYSTEMD_SEARCH_SYSTEM_GENERATOR</constant>, + <constant>SD_PATH_SYSTEMD_SEARCH_USER_GENERATOR</constant>, + <constant>SD_PATH_SYSTEMD_SLEEP</constant>, + <constant>SD_PATH_SYSTEMD_SHUTDOWN</constant>, + + <constant>SD_PATH_TMPFILES</constant>, + <constant>SD_PATH_SYSUSERS</constant>, + <constant>SD_PATH_SYSCTL</constant>, + <constant>SD_PATH_BINFMT</constant>, + <constant>SD_PATH_MODULES_LOAD</constant>, + <constant>SD_PATH_CATALOG</constant>, + + <constant>SD_PATH_SYSTEMD_SEARCH_NETWORK</constant>, };</funcsynopsisinfo> <funcprototype> |