From 1bdaad997ddd101fb6d8db8f550e48090bed5fe8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 11 May 2024 20:30:30 +0900 Subject: [PATCH] journal-rate-limit: use FOREACH_ELEMENT() and usec_add() --- src/journal/journald-rate-limit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c index 25a5d2e92dd..1ea60c22cf4 100644 --- a/src/journal/journald-rate-limit.c +++ b/src/journal/journald-rate-limit.c @@ -102,12 +102,10 @@ void journal_ratelimit_free(JournalRateLimit *r) { } static bool journal_ratelimit_group_expired(JournalRateLimitGroup *g, usec_t ts) { - unsigned i; - assert(g); - for (i = 0; i < POOLS_MAX; i++) - if (g->pools[i].begin + g->interval >= ts) + FOREACH_ELEMENT(p, g->pools) + if (usec_add(p->begin, g->interval) >= ts) return false; return true; @@ -236,7 +234,7 @@ int journal_ratelimit_test(JournalRateLimit *r, const char *id, usec_t rl_interv return 1; } - if (p->begin + rl_interval < ts) { + if (usec_add(p->begin, rl_interval) < ts) { unsigned s; s = p->suppressed; -- 2.47.3