]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: remove error check that never happens 983/head
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>
Fri, 14 Aug 2015 21:40:27 +0000 (23:40 +0200)
committerThomas Hindoe Paaboel Andersen <phomes@gmail.com>
Mon, 17 Aug 2015 22:11:16 +0000 (00:11 +0200)
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.

src/journal/sd-journal.c

index 9f0f71aa815d4cfbd8e3a3eccd52fa11f7091ef8..bfd1901e163dc4482cd6cbe4fadee1fb5f5acac7 100644 (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) {