diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-10-16 13:56:14 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-10-16 16:27:15 +0200 |
commit | a53f90ca2454ad9020d44668eb2a03a6790a3e3a (patch) | |
tree | 3ebb5dacdc7b7516c79e50eff645210fe2ebb67e /src/journal/journald-rate-limit.c | |
parent | 43d3c94e643cd55987cbee17c206e16d1f9c1f06 (diff) | |
download | systemd-a53f90ca2454ad9020d44668eb2a03a6790a3e3a.tar.gz |
siphash24: add helper for calculating the hash value for a string
Let's shorten some code.
Diffstat (limited to 'src/journal/journald-rate-limit.c')
-rw-r--r-- | src/journal/journald-rate-limit.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c index 6a8a36a736..a175c1f68f 100644 --- a/src/journal/journald-rate-limit.c +++ b/src/journal/journald-rate-limit.c @@ -128,7 +128,6 @@ static void journal_rate_limit_vacuum(JournalRateLimit *r, usec_t ts) { static JournalRateLimitGroup* journal_rate_limit_group_new(JournalRateLimit *r, const char *id, usec_t ts) { JournalRateLimitGroup *g; - struct siphash state; assert(r); assert(id); @@ -141,9 +140,7 @@ static JournalRateLimitGroup* journal_rate_limit_group_new(JournalRateLimit *r, if (!g->id) goto fail; - siphash24_init(&state, r->hash_key); - string_hash_func(g->id, &state); - g->hash = siphash24_finalize(&state); + g->hash = siphash24_string(g->id, r->hash_key); journal_rate_limit_vacuum(r, ts); @@ -193,7 +190,6 @@ int journal_rate_limit_test(JournalRateLimit *r, const char *id, int priority, u uint64_t h; JournalRateLimitGroup *g; JournalRateLimitPool *p; - struct siphash state; unsigned burst; usec_t ts; @@ -216,9 +212,7 @@ int journal_rate_limit_test(JournalRateLimit *r, const char *id, int priority, u ts = now(CLOCK_MONOTONIC); - siphash24_init(&state, r->hash_key); - string_hash_func(id, &state); - h = siphash24_finalize(&state); + h = siphash24_string(id, r->hash_key); g = r->buckets[h % BUCKETS_MAX]; LIST_FOREACH(bucket, g, g) |