From eea6084983ba2f799e8e2e648478148104b37f76 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Apr 2010 18:16:09 +0100 Subject: [PATCH] rename backlog_nextscan_periods to until_backlog_nextscan --- backends/innduct.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/backends/innduct.c b/backends/innduct.c index fe7be9b..ac9b943 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -1758,14 +1758,14 @@ static void close_defer(void) { sysdie("could not unlink old defer link %s to backlog file %s", path_defer, backlog); - if (backlog_nextscan_periods < 0 || - backlog_nextscan_periods > backlog_retry_minperiods + 1) - backlog_nextscan_periods= backlog_retry_minperiods + 1; + if (until_backlog_nextscan < 0 || + until_backlog_nextscan > backlog_retry_minperiods + 1) + until_backlog_nextscan= backlog_retry_minperiods + 1; } static void poll_backlog_file(void) { - if (backlog_nextscan_periods < 0) return; - if (backlog_nextscan_periods-- > 0) return; + if (until_backlog_nextscan < 0) return; + if (until_backlog_nextscan-- > 0) return; search_backlog_file(); } @@ -1822,7 +1822,7 @@ static int search_backlog_file(void) { if (!oldest_path) { debug("backlog scan: none"); - backlog_nextscan_periods= backlog_spontaneous_rescan_periods; + until_backlog_nextscan= backlog_spontaneous_rescan_periods; return 0; } @@ -1840,18 +1840,18 @@ static int search_backlog_file(void) { goto try_again; } inputfile_tailing_start(backlog_input_file); - backlog_nextscan_periods= -1; + until_backlog_nextscan= -1; return 1; } - backlog_nextscan_periods= age_deficiency / PERIOD_SECONDS; + until_backlog_nextscan= age_deficiency / PERIOD_SECONDS; if (backlog_spontaneous_rescan_periods >= 0 && - backlog_nextscan_periods > backlog_spontaneous_rescan_periods) - backlog_nextscan_periods= backlog_spontaneous_rescan_periods; + until_backlog_nextscan > backlog_spontaneous_rescan_periods) + until_backlog_nextscan= backlog_spontaneous_rescan_periods; debug("backlog scan: young age=%f deficiency=%ld nextscan=%d oldest=%s", - age, age_deficiency, backlog_nextscan_periods, oldest_path); + age, age_deficiency, until_backlog_nextscan, oldest_path); return 2; } -- 2.30.2