diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-23 10:48:13 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-23 11:50:18 +0100 |
| commit | 5980d463048f25411c55da2f6387cdc8eaeef4c8 (patch) | |
| tree | e5c32417015bfd67d326d278b1cd7dac3ada39de /src/shared/find-esp.c | |
| parent | 5b391395822575533ab0fc93485fc5554d0da099 (diff) | |
| download | systemd-5980d463048f25411c55da2f6387cdc8eaeef4c8.tar.gz | |
strv: declare iterator of FOREACH_STRING() in the loop
Same idea as 03677889f0ef42cdc534bf3b31265a054b20a354.
No functional change intended. The type of the iterator is generally changed to
be 'const char*' instead of 'char*'. Despite the type commonly used, modifying
the string was not allowed.
I adjusted the naming of some short variables for clarity and reduced the scope
of some variable declarations in code that was being touched anyway.
Diffstat (limited to 'src/shared/find-esp.c')
| -rw-r--r-- | src/shared/find-esp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c index 1569b46bdf..fca24329d4 100644 --- a/src/shared/find-esp.c +++ b/src/shared/find-esp.c @@ -435,7 +435,8 @@ int find_esp_and_warn( goto found; } - FOREACH_STRING(path, "/efi", "/boot", "/boot/efi") { + FOREACH_STRING(_path, "/efi", "/boot", "/boot/efi") { + path = _path; r = verify_esp(path, /* searching= */ true, unprivileged_mode, ret_part, ret_pstart, ret_psize, ret_uuid, ret_devid); if (r >= 0) |