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

Rename _PATH variables to _DIR when they refer to a directory

Browse Source 
We were very inconsistent in this, but in general _PATH signifies
a search path (separated with :), and _DIR signifies a single directory.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-03-27 20:12:45 +01:00
parent 9c5bb2033d
commit 96d33e4ac0
5 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-path/sd-path.c
+5 -5
View File
@@ -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: