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 /src/path/path.c | |
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 'src/path/path.c')
-rw-r--r-- | src/path/path.c | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/src/path/path.c b/src/path/path.c index 5d6afb96f0..b1c5442d00 100644 --- a/src/path/path.c +++ b/src/path/path.c @@ -18,71 +18,71 @@ static const char *arg_suffix = NULL; static const char* const path_table[_SD_PATH_MAX] = { - [SD_PATH_TEMPORARY] = "temporary", - [SD_PATH_TEMPORARY_LARGE] = "temporary-large", - [SD_PATH_SYSTEM_BINARIES] = "system-binaries", - [SD_PATH_SYSTEM_INCLUDE] = "system-include", - [SD_PATH_SYSTEM_LIBRARY_PRIVATE] = "system-library-private", - [SD_PATH_SYSTEM_LIBRARY_ARCH] = "system-library-arch", - [SD_PATH_SYSTEM_SHARED] = "system-shared", - [SD_PATH_SYSTEM_CONFIGURATION_FACTORY] = "system-configuration-factory", - [SD_PATH_SYSTEM_STATE_FACTORY] = "system-state-factory", - [SD_PATH_SYSTEM_CONFIGURATION] = "system-configuration", - [SD_PATH_SYSTEM_RUNTIME] = "system-runtime", - [SD_PATH_SYSTEM_RUNTIME_LOGS] = "system-runtime-logs", - [SD_PATH_SYSTEM_STATE_PRIVATE] = "system-state-private", - [SD_PATH_SYSTEM_STATE_LOGS] = "system-state-logs", - [SD_PATH_SYSTEM_STATE_CACHE] = "system-state-cache", - [SD_PATH_SYSTEM_STATE_SPOOL] = "system-state-spool", - [SD_PATH_USER_BINARIES] = "user-binaries", - [SD_PATH_USER_LIBRARY_PRIVATE] = "user-library-private", - [SD_PATH_USER_LIBRARY_ARCH] = "user-library-arch", - [SD_PATH_USER_SHARED] = "user-shared", - [SD_PATH_USER_CONFIGURATION] = "user-configuration", - [SD_PATH_USER_RUNTIME] = "user-runtime", - [SD_PATH_USER_STATE_CACHE] = "user-state-cache", - [SD_PATH_USER] = "user", - [SD_PATH_USER_DOCUMENTS] = "user-documents", - [SD_PATH_USER_MUSIC] = "user-music", - [SD_PATH_USER_PICTURES] = "user-pictures", - [SD_PATH_USER_VIDEOS] = "user-videos", - [SD_PATH_USER_DOWNLOAD] = "user-download", - [SD_PATH_USER_PUBLIC] = "user-public", - [SD_PATH_USER_TEMPLATES] = "user-templates", - [SD_PATH_USER_DESKTOP] = "user-desktop", - [SD_PATH_SEARCH_BINARIES] = "search-binaries", - [SD_PATH_SEARCH_BINARIES_DEFAULT] = "search-binaries-default", - [SD_PATH_SEARCH_LIBRARY_PRIVATE] = "search-library-private", - [SD_PATH_SEARCH_LIBRARY_ARCH] = "search-library-arch", - [SD_PATH_SEARCH_SHARED] = "search-shared", - [SD_PATH_SEARCH_CONFIGURATION_FACTORY] = "search-configuration-factory", - [SD_PATH_SEARCH_STATE_FACTORY] = "search-state-factory", - [SD_PATH_SEARCH_CONFIGURATION] = "search-configuration", - - [SD_PATH_SYSTEMD_UTIL_DIR] = "systemd-util-dir", - [SD_PATH_SYSTEMD_SYSTEM_UNIT_DIR] = "systemd-system-unit-dir", - [SD_PATH_SYSTEMD_SYSTEM_PRESET_DIR] = "systemd-system-preset-dir", - [SD_PATH_SYSTEMD_USER_UNIT_DIR] = "systemd-user-unit-dir", - [SD_PATH_SYSTEMD_USER_PRESET_DIR] = "systemd-user-preset-dir", - [SD_PATH_SYSTEMD_SYSTEM_CONF_DIR] = "systemd-system-conf-dir", - [SD_PATH_SYSTEMD_USER_CONF_DIR] = "systemd-user-conf-dir", - [SD_PATH_SYSTEMD_SYSTEM_UNIT_PATH] = "systemd-system-unit-path", - [SD_PATH_SYSTEMD_USER_UNIT_PATH] = "systemd-user-unit-path", - [SD_PATH_SYSTEMD_SYSTEM_GENERATOR_DIR] = "systemd-system-generator-dir", - [SD_PATH_SYSTEMD_USER_GENERATOR_DIR] = "systemd-user-generator-dir", - [SD_PATH_SYSTEMD_SYSTEM_GENERATOR_PATH] = "systemd-system-generator-path", - [SD_PATH_SYSTEMD_USER_GENERATOR_PATH] = "systemd-user-generator-path", - [SD_PATH_SYSTEMD_SLEEP_DIR] = "systemd-sleep-dir", - [SD_PATH_SYSTEMD_SHUTDOWN_DIR] = "systemd-shutdown-dir", - - [SD_PATH_TMPFILES_DIR] = "tmpfiles-dir", - [SD_PATH_SYSUSERS_DIR] = "sysusers-dir", - [SD_PATH_SYSCTL_DIR] = "sysctl-dir", - [SD_PATH_BINFMT_DIR] = "binfmt-dir", - [SD_PATH_MODULES_LOAD_DIR] = "modules-load-dir", - [SD_PATH_CATALOG_DIR] = "catalog-dir", - - [SD_PATH_SYSTEMD_NETWORK_PATH] = "systemd-network-path", + [SD_PATH_TEMPORARY] = "temporary", + [SD_PATH_TEMPORARY_LARGE] = "temporary-large", + [SD_PATH_SYSTEM_BINARIES] = "system-binaries", + [SD_PATH_SYSTEM_INCLUDE] = "system-include", + [SD_PATH_SYSTEM_LIBRARY_PRIVATE] = "system-library-private", + [SD_PATH_SYSTEM_LIBRARY_ARCH] = "system-library-arch", + [SD_PATH_SYSTEM_SHARED] = "system-shared", + [SD_PATH_SYSTEM_CONFIGURATION_FACTORY] = "system-configuration-factory", + [SD_PATH_SYSTEM_STATE_FACTORY] = "system-state-factory", + [SD_PATH_SYSTEM_CONFIGURATION] = "system-configuration", + [SD_PATH_SYSTEM_RUNTIME] = "system-runtime", + [SD_PATH_SYSTEM_RUNTIME_LOGS] = "system-runtime-logs", + [SD_PATH_SYSTEM_STATE_PRIVATE] = "system-state-private", + [SD_PATH_SYSTEM_STATE_LOGS] = "system-state-logs", + [SD_PATH_SYSTEM_STATE_CACHE] = "system-state-cache", + [SD_PATH_SYSTEM_STATE_SPOOL] = "system-state-spool", + [SD_PATH_USER_BINARIES] = "user-binaries", + [SD_PATH_USER_LIBRARY_PRIVATE] = "user-library-private", + [SD_PATH_USER_LIBRARY_ARCH] = "user-library-arch", + [SD_PATH_USER_SHARED] = "user-shared", + [SD_PATH_USER_CONFIGURATION] = "user-configuration", + [SD_PATH_USER_RUNTIME] = "user-runtime", + [SD_PATH_USER_STATE_CACHE] = "user-state-cache", + [SD_PATH_USER] = "user", + [SD_PATH_USER_DOCUMENTS] = "user-documents", + [SD_PATH_USER_MUSIC] = "user-music", + [SD_PATH_USER_PICTURES] = "user-pictures", + [SD_PATH_USER_VIDEOS] = "user-videos", + [SD_PATH_USER_DOWNLOAD] = "user-download", + [SD_PATH_USER_PUBLIC] = "user-public", + [SD_PATH_USER_TEMPLATES] = "user-templates", + [SD_PATH_USER_DESKTOP] = "user-desktop", + [SD_PATH_SEARCH_BINARIES] = "search-binaries", + [SD_PATH_SEARCH_BINARIES_DEFAULT] = "search-binaries-default", + [SD_PATH_SEARCH_LIBRARY_PRIVATE] = "search-library-private", + [SD_PATH_SEARCH_LIBRARY_ARCH] = "search-library-arch", + [SD_PATH_SEARCH_SHARED] = "search-shared", + [SD_PATH_SEARCH_CONFIGURATION_FACTORY] = "search-configuration-factory", + [SD_PATH_SEARCH_STATE_FACTORY] = "search-state-factory", + [SD_PATH_SEARCH_CONFIGURATION] = "search-configuration", + + [SD_PATH_SYSTEMD_UTIL] = "systemd-util", + [SD_PATH_SYSTEMD_SYSTEM_UNIT] = "systemd-system-unit", + [SD_PATH_SYSTEMD_SYSTEM_PRESET] = "systemd-system-preset", + [SD_PATH_SYSTEMD_SYSTEM_CONF] = "systemd-system-conf", + [SD_PATH_SYSTEMD_SEARCH_SYSTEM_UNIT] = "systemd-system-unit", + [SD_PATH_SYSTEMD_SYSTEM_GENERATOR] = "systemd-system-generator", + [SD_PATH_SYSTEMD_SEARCH_SYSTEM_GENERATOR] = "systemd-system-generator", + [SD_PATH_SYSTEMD_USER_UNIT] = "systemd-user-unit", + [SD_PATH_SYSTEMD_USER_PRESET] = "systemd-user-preset", + [SD_PATH_SYSTEMD_USER_CONF] = "systemd-user-conf", + [SD_PATH_SYSTEMD_SEARCH_USER_UNIT] = "systemd-user-unit", + [SD_PATH_SYSTEMD_SEARCH_USER_GENERATOR] = "systemd-user-generator", + [SD_PATH_SYSTEMD_USER_GENERATOR] = "systemd-user-generator", + [SD_PATH_SYSTEMD_SLEEP] = "systemd-sleep", + [SD_PATH_SYSTEMD_SHUTDOWN] = "systemd-shutdown", + + [SD_PATH_TMPFILES] = "tmpfiles", + [SD_PATH_SYSUSERS] = "sysusers", + [SD_PATH_SYSCTL] = "sysctl", + [SD_PATH_BINFMT] = "binfmt", + [SD_PATH_MODULES_LOAD] = "modules-load", + [SD_PATH_CATALOG] = "catalog", + + [SD_PATH_SYSTEMD_SEARCH_NETWORK] = "systemd-search-network", }; static int list_homes(void) { |