summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-path
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-24 16:28:26 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-27 20:12:45 +0100
commit96d33e4ac0ba9fa42f4ec8379d8decf1c722197d (patch)
treea200903d93f71feb9025cd860a600a627ae8d6bd /src/libsystemd/sd-path
parent9c5bb2033db0c0927593b929ff760b69295a9f70 (diff)
downloadsystemd-96d33e4ac0ba9fa42f4ec8379d8decf1c722197d.tar.gz
Rename _PATH variables to _DIR when they refer to a directory
We were very inconsistent in this, but in general _PATH signifies a search path (separated with :), and _DIR signifies a single directory.
Diffstat (limited to 'src/libsystemd/sd-path')
-rw-r--r--src/libsystemd/sd-path/sd-path.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index edc32fbd87..4fd96fb5a2 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -333,7 +333,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
return 0;
case SD_PATH_SYSTEMD_USER_UNIT_DIR:
- *ret = USER_DATA_UNIT_PATH;
+ *ret = USER_DATA_UNIT_DIR;
return 0;
case SD_PATH_SYSTEMD_USER_PRESET_DIR:
@@ -341,19 +341,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
return 0;
case SD_PATH_SYSTEMD_SYSTEM_CONF_DIR:
- *ret = SYSTEM_CONFIG_UNIT_PATH; // FIXME: _DIR vs. _PATH
+ *ret = SYSTEM_CONFIG_UNIT_DIR;
return 0;
case SD_PATH_SYSTEMD_USER_CONF_DIR:
- *ret = USER_CONFIG_UNIT_PATH; // FIXME: _DIR vs. _PATH
+ *ret = USER_CONFIG_UNIT_DIR;
return 0;
case SD_PATH_SYSTEMD_SYSTEM_GENERATOR_DIR:
- *ret = SYSTEM_GENERATOR_PATH; // FIXME: _DIR vs. _PATH
+ *ret = SYSTEM_GENERATOR_DIR;
return 0;
case SD_PATH_SYSTEMD_USER_GENERATOR_DIR:
- *ret = USER_GENERATOR_PATH; // FIXME: _DIR vs. _PATH
+ *ret = USER_GENERATOR_DIR;
return 0;
case SD_PATH_SYSTEMD_SLEEP_DIR: