From: Lennart Poettering Date: Mon, 10 Jul 2023 12:54:11 +0000 (+0200) Subject: tree-wide: drop trailing newline from various log calls X-Git-Tag: v254-rc2~48^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F28343%2Fhead;p=thirdparty%2Fsystemd.git tree-wide: drop trailing newline from various log calls We generate this implicitly, hence we generally don't include it explicitly. --- diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c index 068ab3f4a0e..7ffafcda553 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -140,7 +140,7 @@ static int run(int argc, char *argv[]) { if (r < 0) goto fallback; if (!r) { - log_warning("%s is not inactive. Please review the %s setting.\n", target, target); + log_warning("%s is not inactive. Please review the %s setting.", target, target); goto fallback; } @@ -148,7 +148,7 @@ static int run(int argc, char *argv[]) { break; fallback: - log_warning("Fallback to the single-user shell.\n"); + log_warning("Fallback to the single-user shell."); } return 0; diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index b26a834530d..c0bf5859635 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -21,9 +21,9 @@ static void log_cgroup_mask(CGroupMask got, CGroupMask expected) { _cleanup_free_ char *e_store = NULL, *g_store = NULL; assert_se(cg_mask_to_string(expected, &e_store) >= 0); - log_info("Expected mask: %s\n", e_store); + log_info("Expected mask: %s", e_store); assert_se(cg_mask_to_string(got, &g_store) >= 0); - log_info("Got mask: %s\n", g_store); + log_info("Got mask: %s", g_store); } TEST_RET(cgroup_mask, .sd_booted = true) { diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index faf64767785..e5bc6c457b7 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.c @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) { } for (i = 0; i < n; i++) - log_info("fd=%i name=%s\n", SD_LISTEN_FDS_START + i, l[i]); + log_info("fd=%i name=%s", SD_LISTEN_FDS_START + i, l[i]); sd_notify(0, "STATUS=Starting up"); diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 4a39d06ef88..58dc88110e7 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -214,7 +214,7 @@ TEST(benchmark_sd_id128_get_machine_app_specific) { q = now(CLOCK_MONOTONIC) - t; - log_info("%lf μs each\n", (double) q / iterations); + log_info("%lf μs each", (double) q / iterations); } TEST(id128_at) { diff --git a/src/test/test-json.c b/src/test/test-json.c index 6a544c3fb7b..3657075a544 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -95,7 +95,7 @@ static void test_variant_one(const char *data, Test test) { assert_se(s); assert_se((size_t) r == strlen(s)); - log_info("formatted normally: %s\n", s); + log_info("formatted normally: %s", s); r = json_parse(data, JSON_PARSE_SENSITIVE, &w, NULL, NULL); assert_se(r == 0); @@ -305,7 +305,7 @@ TEST(build) { JSON_BUILD_STRV((char**) arr_1234))) >= 0); assert_se(json_variant_format(a, 0, &s) >= 0); - log_info("GOT: %s\n", s); + log_info("GOT: %s", s); assert_se(json_parse(s, 0, &b, NULL, NULL) >= 0); assert_se(json_variant_equal(a, b)); @@ -316,10 +316,10 @@ TEST(build) { s = mfree(s); assert_se(json_variant_format(a, 0, &s) >= 0); - log_info("GOT: %s\n", s); + log_info("GOT: %s", s); assert_se(json_parse(s, 0, &b, NULL, NULL) >= 0); assert_se(json_variant_format(b, 0, &t) >= 0); - log_info("GOT: %s\n", t); + log_info("GOT: %s", t); assert_se(streq(s, t)); diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index e4ee9f697d6..ac0ad80132d 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -923,7 +923,7 @@ TEST(config_parse_memory_limit) { r = config_parse_memory_limit(NULL, "fake", 1, "section", 1, limit_tests[i].limit, 1, limit_tests[i].value, &c, NULL); - log_info("%s=%s\t%"PRIu64"==%"PRIu64"\n", + log_info("%s=%s\t%"PRIu64"==%"PRIu64, limit_tests[i].limit, limit_tests[i].value, *limit_tests[i].result, limit_tests[i].expected); assert_se(r >= 0); diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index 80ee0957868..1aba4d7ae3f 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -614,7 +614,7 @@ TEST(getpid_measure) { (void) getpid(); q = now(CLOCK_MONOTONIC) - t; - log_info(" glibc getpid(): %lf μs each\n", (double) q / iterations); + log_info(" glibc getpid(): %lf μs each", (double) q / iterations); iterations *= 50; /* _cached() is about 50 times faster, so we need more iterations */ @@ -623,7 +623,7 @@ TEST(getpid_measure) { (void) getpid_cached(); q = now(CLOCK_MONOTONIC) - t; - log_info("getpid_cached(): %lf μs each\n", (double) q / iterations); + log_info("getpid_cached(): %lf μs each", (double) q / iterations); } TEST(safe_fork) {