clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 15:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: remove error check that never happens

Browse Source 
remove_directory will always return 0 so this can never happen.
Besides that, d->path and d are freed so we would end up with
a null pointer dereference anyway.
This commit is contained in:
Thomas Hindoe Paaboel Andersen
2015-08-18 00:11:16 +02:00
parent d2b5f6bdbb
commit b2b46f91db
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/sd-journal.c
+3 -9
View File
@@ -1489,7 +1489,7 @@ static int add_root_directory(sd_journal *j, const char *p) {
return 0;
}
static int remove_directory(sd_journal *j, Directory *d) {
static void remove_directory(sd_journal *j, Directory *d) {
assert(j);
if (d->wd > 0) {
@@ -1508,8 +1508,6 @@ static int remove_directory(sd_journal *j, Directory *d) {
free(d->path);
free(d);
return 0;
}
static int add_search_paths(sd_journal *j) {
@@ -2147,12 +2145,8 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
/* Event for a subdirectory */
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
r = remove_directory(j, d);
if (r < 0)
log_debug_errno(r, "Failed to remove directory %s: %m", d->path);
}
if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT))
remove_directory(j, d);
} else if (d->is_root && (e->mask & IN_ISDIR) && e->len > 0 && sd_id128_from_string(e->name, &id) >= 0) {