diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-19 17:49:14 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-20 16:05:53 +0200 |
| commit | 5ac1530eca652cd16819853fe06e76e156f5cf5e (patch) | |
| tree | 34b57a84fa54bb1a1963d07ab273cd094a430ad6 /src/import | |
| parent | 7bf081a1e59d2ac4941f24d27c6d7647c5ed703b (diff) | |
| download | systemd-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/import')
| -rw-r--r-- | src/import/export-raw.c | 6 | ||||
| -rw-r--r-- | src/import/export-tar.c | 6 | ||||
| -rw-r--r-- | src/import/import-raw.c | 6 | ||||
| -rw-r--r-- | src/import/import-tar.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/import/export-raw.c b/src/import/export-raw.c index 57b4334a65..d76f3c0519 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -49,7 +49,7 @@ struct RawExport { uint64_t written_uncompressed; unsigned last_percent; - RateLimit progress_rate_limit; + RateLimit progress_ratelimit; struct stat st; @@ -96,7 +96,7 @@ int raw_export_new( .on_finished = on_finished, .userdata = userdata, .last_percent = (unsigned) -1, - .progress_rate_limit = { 100 * USEC_PER_MSEC, 1 }, + .progress_ratelimit = { 100 * USEC_PER_MSEC, 1 }, }; if (event) @@ -124,7 +124,7 @@ static void raw_export_report_progress(RawExport *e) { if (percent == e->last_percent) return; - if (!ratelimit_below(&e->progress_rate_limit)) + if (!ratelimit_below(&e->progress_ratelimit)) return; sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); diff --git a/src/import/export-tar.c b/src/import/export-tar.c index b66b5ee37c..5f89880ed6 100644 --- a/src/import/export-tar.c +++ b/src/import/export-tar.c @@ -44,7 +44,7 @@ struct TarExport { uint64_t quota_referenced; unsigned last_percent; - RateLimit progress_rate_limit; + RateLimit progress_ratelimit; bool eof; bool tried_splice; @@ -99,7 +99,7 @@ int tar_export_new( .userdata = userdata, .quota_referenced = (uint64_t) -1, .last_percent = (unsigned) -1, - .progress_rate_limit = { 100 * USEC_PER_MSEC, 1 }, + .progress_ratelimit = { 100 * USEC_PER_MSEC, 1 }, }; if (event) @@ -131,7 +131,7 @@ static void tar_export_report_progress(TarExport *e) { if (percent == e->last_percent) return; - if (!ratelimit_below(&e->progress_rate_limit)) + if (!ratelimit_below(&e->progress_ratelimit)) return; sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); diff --git a/src/import/import-raw.c b/src/import/import-raw.c index dc73387bc2..a12a6d63b1 100644 --- a/src/import/import-raw.c +++ b/src/import/import-raw.c @@ -57,7 +57,7 @@ struct RawImport { struct stat st; unsigned last_percent; - RateLimit progress_rate_limit; + RateLimit progress_ratelimit; }; RawImport* raw_import_unref(RawImport *i) { @@ -111,7 +111,7 @@ int raw_import_new( .userdata = userdata, .last_percent = (unsigned) -1, .image_root = TAKE_PTR(root), - .progress_rate_limit = { 100 * USEC_PER_MSEC, 1 }, + .progress_ratelimit = { 100 * USEC_PER_MSEC, 1 }, }; if (event) @@ -143,7 +143,7 @@ static void raw_import_report_progress(RawImport *i) { if (percent == i->last_percent) return; - if (!ratelimit_below(&i->progress_rate_limit)) + if (!ratelimit_below(&i->progress_ratelimit)) return; sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); diff --git a/src/import/import-tar.c b/src/import/import-tar.c index c2ece7af74..1e50d31bc2 100644 --- a/src/import/import-tar.c +++ b/src/import/import-tar.c @@ -60,7 +60,7 @@ struct TarImport { pid_t tar_pid; unsigned last_percent; - RateLimit progress_rate_limit; + RateLimit progress_ratelimit; }; TarImport* tar_import_unref(TarImport *i) { @@ -119,7 +119,7 @@ int tar_import_new( .userdata = userdata, .last_percent = (unsigned) -1, .image_root = TAKE_PTR(root), - .progress_rate_limit = { 100 * USEC_PER_MSEC, 1 }, + .progress_ratelimit = { 100 * USEC_PER_MSEC, 1 }, }; if (event) @@ -151,7 +151,7 @@ static void tar_import_report_progress(TarImport *i) { if (percent == i->last_percent) return; - if (!ratelimit_below(&i->progress_rate_limit)) + if (!ratelimit_below(&i->progress_ratelimit)) return; sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent); |