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

discover-image: use _SD_PATH_INVALID where appropriate

Browse Source 
The enum definition only exists for cases like this, use it, instead of
its literal value.

This doesn't effectively change anything, but cleans up the code a bit.
This commit is contained in:
Lennart Poettering
2025-11-24 17:42:04 +00:00
committed by Luca Boccassi
parent b26e6207cb
commit 3a5d9ee980
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/discover-image.c
+3 -3
View File
@@ -171,13 +171,13 @@ static char** image_settings_path(Image *image, RuntimeScope scope) {
SD_PATH_SYSTEM_CONFIGURATION, SD_PATH_SYSTEM_CONFIGURATION,
SD_PATH_SYSTEM_RUNTIME, SD_PATH_SYSTEM_RUNTIME,
SD_PATH_SYSTEM_LIBRARY_PRIVATE, SD_PATH_SYSTEM_LIBRARY_PRIVATE,
UINT64_MAX _SD_PATH_INVALID
}; };
static const uint64_t user_locations[] = { static const uint64_t user_locations[] = {
SD_PATH_USER_CONFIGURATION, SD_PATH_USER_CONFIGURATION,
SD_PATH_USER_RUNTIME, SD_PATH_USER_RUNTIME,
SD_PATH_USER_LIBRARY_PRIVATE, SD_PATH_USER_LIBRARY_PRIVATE,
UINT64_MAX _SD_PATH_INVALID
}; };
const uint64_t *locations; const uint64_t *locations;
@@ -194,7 +194,7 @@ static char** image_settings_path(Image *image, RuntimeScope scope) {
assert_not_reached(); assert_not_reached();
} }
for (size_t k = 0; locations[k] != UINT64_MAX; k++) { for (size_t k = 0; locations[k] != _SD_PATH_INVALID; k++) {
_cleanup_free_ char *s = NULL; _cleanup_free_ char *s = NULL;
r = sd_path_lookup(locations[k], "systemd/nspawn", &s); r = sd_path_lookup(locations[k], "systemd/nspawn", &s);
if (r == -ENXIO) if (r == -ENXIO)