diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-21 13:21:44 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-04-21 17:43:55 +0200 |
| commit | 200c7fa6fea5aea301e5b091338c5dc1f88f759c (patch) | |
| tree | eb3aacdfcff7a51c08f3b94dff82b0b0ac2fe357 | |
| parent | 52d629010db73a9466c359201916494bd55186d1 (diff) | |
| download | systemd-200c7fa6fea5aea301e5b091338c5dc1f88f759c.tar.gz | |
udevadm: enclose invocation of unlinkat() with a (void) cast
Let's make Coverity happy about this one.
| -rw-r--r-- | src/udev/udevadm-info.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 352e024a7c..b3d5565c48 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -205,17 +205,15 @@ static void cleanup_dir(DIR *dir, mode_t mask, int depth) { if ((stats.st_mode & mask) != 0) continue; if (S_ISDIR(stats.st_mode)) { - DIR *dir2; + _cleanup_closedir_ DIR *dir2; dir2 = fdopendir(openat(dirfd(dir), dent->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)); - if (dir2 != NULL) { + if (dir2 != NULL) cleanup_dir(dir2, mask, depth-1); - closedir(dir2); - } - unlinkat(dirfd(dir), dent->d_name, AT_REMOVEDIR); - } else { - unlinkat(dirfd(dir), dent->d_name, 0); - } + + (void) unlinkat(dirfd(dir), dent->d_name, AT_REMOVEDIR); + } else + (void) unlinkat(dirfd(dir), dent->d_name, 0); } } |