shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-31 05:47:30 +03:00
Code

os-util: use ENDSWITH_SET where appropriate

Browse Source 
Addresses https://github.com/systemd/systemd/pull/31435#discussion_r1553969156

Co-authored-by: Lennart Poettering <lennart@poettering.net>
This commit is contained in:
Mike Yuan 2024-04-06 02:06:38 +08:00
parent c1e7f938ca
commit 99f3b67f3f
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/basic/os-util.c
View File

@ -72,16 +72,11 @@ int path_extract_image_name(const char *path, char **ret) {
r = path_extract_filename(path, &fn);
if (r < 0)
return r;
if (r != O_DIRECTORY) {
/* Chop off any image suffixes we recognize (unless we already know this must refer to some dir */
FOREACH_STRING(suffix, ".sysext.raw", ".confext.raw", ".raw") {
char *m = endswith(fn, suffix);
if (m) {
*m = 0;
break;
}
}
/* Chop off any image suffixes we recognize (unless we already know this must refer to some dir) */
char *m = ENDSWITH_SET(fn, ".sysext.raw", ".confext.raw", ".raw");
if (m)
*m = 0;
}
/* Truncate the version/counting suffixes */