timeshift: Remove redundant (and faulty) code.

This appears to have been left in place from an older implementation. Ultimately the call to pthread_join will operate on uninit'd memory and could in certain circumstances cause a crash.

Thanks goes to Seri Al-Najjar <salnajjar@gmail.com> for spotting this.

diff --git a/src/timeshift.c b/src/timeshift.c
index 116575135ac72f937a2a7c3f74c89b239d83cffc..2114442e8a3c8c0e037030abb5649b8d0e1ee580 100644 (file)
--- a/src/timeshift.c
+++ b/src/timeshift.c
@@ -126,7 +126,6 @@ timeshift_destroy(streaming_target_t *pad)
   /* Wait for all threads */
   pthread_join(ts->rd_thread, NULL);
   pthread_join(ts->wr_thread, NULL);
-  pthread_join(ts->rm_thread, NULL);
 
   /* Shut stuff down */
   streaming_queue_deinit(&ts->wr_queue);

diff --git a/src/timeshift/private.h b/src/timeshift/private.h
index 455fd93b848acc68d0909332330881cd84f98eff..22022ac14f3b6ae69bc0c343aa34f644592500ba 100644 (file)
--- a/src/timeshift/private.h
+++ b/src/timeshift/private.h
@@ -88,9 +88,6 @@ typedef struct timeshift {
   pthread_t                   rd_thread;  ///< Reader thread
   th_pipe_t                   rd_pipe;    ///< Message passing to reader
 
-  pthread_t                   rm_thread;  ///< Reaper thread
-  timeshift_file_list_t       rm_list;    ///< Remove files
-
   pthread_mutex_t             rdwr_mutex; ///< Buffer protection
   timeshift_file_list_t       files;      ///< List of files