From 306a58a73147cd35491a3bd9facb6e0ee057752e Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 29 Nov 2022 10:20:04 +0100 Subject: [PATCH 1/2] tail: remove unused var "_event_counter" --- src/uu/tail/src/follow/watch.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/uu/tail/src/follow/watch.rs b/src/uu/tail/src/follow/watch.rs index 3ecb47f67..cd1dd49c3 100644 --- a/src/uu/tail/src/follow/watch.rs +++ b/src/uu/tail/src/follow/watch.rs @@ -479,7 +479,6 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> { let mut process = platform::ProcessChecker::new(observer.pid); - let mut _event_counter = 0; let mut _timeout_counter = 0; // main follow loop @@ -529,7 +528,6 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> { .receiver .recv_timeout(settings.sleep_sec); if rx_result.is_ok() { - _event_counter += 1; _timeout_counter = 0; } From a4a69c8ee7e1b93d87500504800d91186d3972d6 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 29 Nov 2022 10:25:48 +0100 Subject: [PATCH 2/2] tail: "_timeout_counter" -> "timeout_counter" --- src/uu/tail/src/follow/watch.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uu/tail/src/follow/watch.rs b/src/uu/tail/src/follow/watch.rs index cd1dd49c3..fbda27aa0 100644 --- a/src/uu/tail/src/follow/watch.rs +++ b/src/uu/tail/src/follow/watch.rs @@ -479,7 +479,7 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> { let mut process = platform::ProcessChecker::new(observer.pid); - let mut _timeout_counter = 0; + let mut timeout_counter = 0; // main follow loop loop { @@ -528,7 +528,7 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> { .receiver .recv_timeout(settings.sleep_sec); if rx_result.is_ok() { - _timeout_counter = 0; + timeout_counter = 0; } let mut paths = vec![]; // Paths worth checking for new content to print @@ -567,7 +567,7 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> { } Ok(Err(e)) => return Err(USimpleError::new(1, format!("NotifyError: {e}"))), Err(mpsc::RecvTimeoutError::Timeout) => { - _timeout_counter += 1; + timeout_counter += 1; } Err(e) => return Err(USimpleError::new(1, format!("RecvTimeoutError: {e}"))), } @@ -584,7 +584,7 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> { _read_some = observer.files.tail_file(path, settings.verbose)?; } - if _timeout_counter == settings.max_unchanged_stats { + if timeout_counter == settings.max_unchanged_stats { /* TODO: [2021-10; jhscheer] implement timeout_counter for each file. ā€˜--max-unchanged-stats=n’