From: Victor Julien Date: Thu, 27 Feb 2020 19:20:33 +0000 (+0100) Subject: time: minor code cleanup X-Git-Tag: suricata-6.0.0-beta1~691 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13b4ece11d77f383b9674f01609d41ec29458097;p=thirdparty%2Fsuricata.git time: minor code cleanup --- diff --git a/src/util-time.c b/src/util-time.c index 20765431a4..5aec73e3b0 100644 --- a/src/util-time.c +++ b/src/util-time.c @@ -69,7 +69,7 @@ static struct timeval current_time = { 0, 0 }; #endif //static SCMutex current_time_mutex = SCMUTEX_INITIALIZER; static SCSpinlock current_time_spinlock; -static char live = TRUE; +static bool live_time_tracking = true; struct tm *SCLocalTime(time_t timep, struct tm *result); struct tm *SCUtcTime(time_t timep, struct tm *result); @@ -89,24 +89,24 @@ void TimeDeinit(void) void TimeModeSetLive(void) { - live = TRUE; + live_time_tracking = true; SCLogDebug("live time mode enabled"); } void TimeModeSetOffline (void) { - live = FALSE; + live_time_tracking = false; SCLogDebug("offline time mode enabled"); } -int TimeModeIsLive(void) +bool TimeModeIsLive(void) { - return live; + return live_time_tracking; } void TimeSetByThread(const int thread_id, const struct timeval *tv) { - if (live == TRUE) + if (live_time_tracking) return; TmThreadsSetThreadTimestamp(thread_id, tv); @@ -115,7 +115,7 @@ void TimeSetByThread(const int thread_id, const struct timeval *tv) #ifdef UNITTESTS void TimeSet(struct timeval *tv) { - if (live == TRUE) + if (live_time_tracking) return; if (tv == NULL) @@ -148,7 +148,7 @@ void TimeGet(struct timeval *tv) if (tv == NULL) return; - if (live == TRUE) { + if (live_time_tracking) { gettimeofday(tv, NULL); } else { #ifdef UNITTESTS diff --git a/src/util-time.h b/src/util-time.h index e3cfb8315b..6881b33cb3 100644 --- a/src/util-time.h +++ b/src/util-time.h @@ -51,7 +51,7 @@ void TimeSetIncrementTime(uint32_t); void TimeModeSetLive(void); void TimeModeSetOffline (void); -int TimeModeIsLive(void); +bool TimeModeIsLive(void); struct tm *SCLocalTime(time_t timep, struct tm *result); void CreateTimeString(const struct timeval *ts, char *str, size_t size);