summaryrefslogtreecommitdiff
path: root/src/journal/journald-context.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-09-19 17:49:14 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-09-20 16:05:53 +0200
commit5ac1530eca652cd16819853fe06e76e156f5cf5e (patch)
tree34b57a84fa54bb1a1963d07ab273cd094a430ad6 /src/journal/journald-context.c
parent7bf081a1e59d2ac4941f24d27c6d7647c5ed703b (diff)
downloadsystemd-5ac1530eca652cd16819853fe06e76e156f5cf5e.tar.gz
tree-wide: say "ratelimit" not "rate_limit"
"ratelimit" is a real word, so we don't need to use the other form anywhere. We had both forms in various places, let's standarize on the shorter and more correct one.
Diffstat (limited to 'src/journal/journald-context.c')
-rw-r--r--src/journal/journald-context.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index 46edf24cd6..342ed062d4 100644
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -132,8 +132,8 @@ static int client_context_new(Server *s, pid_t pid, ClientContext **ret) {
c->timestamp = USEC_INFINITY;
c->extra_fields_mtime = NSEC_INFINITY;
c->log_level_max = -1;
- c->log_rate_limit_interval = s->rate_limit_interval;
- c->log_rate_limit_burst = s->rate_limit_burst;
+ c->log_ratelimit_interval = s->ratelimit_interval;
+ c->log_ratelimit_burst = s->ratelimit_burst;
r = hashmap_put(s->client_contexts, PID_TO_PTR(pid), c);
if (r < 0) {
@@ -182,8 +182,8 @@ static void client_context_reset(Server *s, ClientContext *c) {
c->log_level_max = -1;
- c->log_rate_limit_interval = s->rate_limit_interval;
- c->log_rate_limit_burst = s->rate_limit_burst;
+ c->log_ratelimit_interval = s->ratelimit_interval;
+ c->log_ratelimit_burst = s->ratelimit_burst;
}
static ClientContext* client_context_free(Server *s, ClientContext *c) {
@@ -459,7 +459,7 @@ static int client_context_read_extra_fields(
return 0;
}
-static int client_context_read_log_rate_limit_interval(ClientContext *c) {
+static int client_context_read_log_ratelimit_interval(ClientContext *c) {
_cleanup_free_ char *value = NULL;
const char *p;
int r;
@@ -474,10 +474,10 @@ static int client_context_read_log_rate_limit_interval(ClientContext *c) {
if (r < 0)
return r;
- return safe_atou64(value, &c->log_rate_limit_interval);
+ return safe_atou64(value, &c->log_ratelimit_interval);
}
-static int client_context_read_log_rate_limit_burst(ClientContext *c) {
+static int client_context_read_log_ratelimit_burst(ClientContext *c) {
_cleanup_free_ char *value = NULL;
const char *p;
int r;
@@ -492,7 +492,7 @@ static int client_context_read_log_rate_limit_burst(ClientContext *c) {
if (r < 0)
return r;
- return safe_atou(value, &c->log_rate_limit_burst);
+ return safe_atou(value, &c->log_ratelimit_burst);
}
static void client_context_really_refresh(
@@ -521,8 +521,8 @@ static void client_context_really_refresh(
(void) client_context_read_invocation_id(s, c);
(void) client_context_read_log_level_max(s, c);
(void) client_context_read_extra_fields(s, c);
- (void) client_context_read_log_rate_limit_interval(c);
- (void) client_context_read_log_rate_limit_burst(c);
+ (void) client_context_read_log_ratelimit_interval(c);
+ (void) client_context_read_log_ratelimit_burst(c);
c->timestamp = timestamp;