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

Merge pull request #20004 from yuwata/readdir-ensure-type

Browse Source 
dirent-util: introduce readdir_ensure_type()
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-06-24 15:11:06 +02:00
committed by GitHub
parent 4ef65db34b f565b8676f
commit 280e4b368e
16 changed files with 20 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bootspec.c
-1
View File
@@ -482,7 +482,6 @@ static int boot_entries_find_unified(
_cleanup_free_ char *j = NULL, *osrelease = NULL, *cmdline = NULL;
_cleanup_close_ int fd = -1;
dirent_ensure_type(d, de);
if (!dirent_is_file(de))
continue;
src/shared/install.c
-10
View File
@@ -568,8 +568,6 @@ static int remove_marked_symlinks_fd(
FOREACH_DIRENT(de, d, return -errno) {
dirent_ensure_type(d, de);
if (de->d_type == DT_DIR) {
_cleanup_free_ char *p = NULL;
int nfd, q;
@@ -738,8 +736,6 @@ static int find_symlinks_in_directory(
bool found_path = false, found_dest, b = false;
int q;
dirent_ensure_type(dir, de);
if (de->d_type != DT_LNK)
continue;
@@ -836,8 +832,6 @@ static int find_symlinks(
_cleanup_free_ const char *path = NULL;
_cleanup_closedir_ DIR *d = NULL;
dirent_ensure_type(config_dir, de);
if (de->d_type != DT_DIR)
continue;
@@ -3379,8 +3373,6 @@ int unit_file_preset_all(
if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY))
continue;
dirent_ensure_type(d, de);
if (!IN_SET(de->d_type, DT_LNK, DT_REG))
continue;
@@ -3457,8 +3449,6 @@ int unit_file_get_list(
if (hashmap_get(h, de->d_name))
continue;
dirent_ensure_type(d, de);
if (!IN_SET(de->d_type, DT_LNK, DT_REG))
continue;
src/shared/numa-util.c
-2
View File
@@ -139,8 +139,6 @@ static int numa_max_node(void) {
int node;
const char *n;
(void) dirent_ensure_type(d, de);
if (de->d_type != DT_DIR)
continue;