tree-wide: normalize usage of %m

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index 8e87b1be28b44dbda1b8055a0499572ed7ac1681..560c837b2b6388248016501f83b6a3f5da558155 100644 (file)
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -79,7 +79,7 @@ int mac_selinux_setup(bool *loaded_policy) {
                 if (enforce > 0) {
                         if (!initialized)
                                 return log_struct_errno(LOG_EMERG, SYNTHETIC_ERRNO(EIO),
-                                                        LOG_MESSAGE("Failed to load SELinux policy :%m"),
+                                                        LOG_MESSAGE("Failed to load SELinux policy: %m"),
                                                         LOG_MESSAGE_ID(SD_MESSAGE_SELINUX_FAILED_STR));
 
                         log_notice("Failed to load new SELinux policy. Continuing with old policy.");

diff --git a/src/core/service.c b/src/core/service.c
index 15052f9d0cdc63be15716bdf7091ef587989628b..797f2e7c935212812184c1337168818d4ab2bab3 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -393,7 +393,7 @@ static void service_extend_event_source_timeout(Service *s, sd_event_source *sou
         if (r < 0) {
                 const char *desc;
                 (void) sd_event_source_get_description(s->timer_event_source, &desc);
-                log_unit_warning_errno(UNIT(s), r, "Failed to set timeout time for event source '%s', ignoring %m", strna(desc));
+                log_unit_warning_errno(UNIT(s), r, "Failed to set timeout time for event source '%s', ignoring: %m", strna(desc));
         }
 }
 

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index b60da006b3f7cd50ce039f2da5befda473e824c8..c595f81b40ce4a7b4069ec5f3cdbd00f0b4de7d9 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -304,7 +304,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
 
         f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
         if (!f)
-                return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
+                return log_error_errno(errno, "Failed to open keyboard mapping list: %m");
 
         if (streq(argv[0], "list-x11-keymap-models"))
                 look_for = MODELS;

diff --git a/src/login/logind-wall.c b/src/login/logind-wall.c
index dabedbdea06d8af8da79fee105c48a725e277fbe..20c667f4ec8dd62b793d8a7f9026b63cdefb2a79 100644 (file)
--- a/src/login/logind-wall.c
+++ b/src/login/logind-wall.c
@@ -107,11 +107,11 @@ static int wall_message_timeout_handler(
         if (next > 0) {
                 r = sd_event_source_set_time(s, n + next);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_time() failed. %m");
+                        return log_error_errno(r, "sd_event_source_set_time() failed: %m");
 
                 r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT);
                 if (r < 0)
-                        return log_error_errno(r, "sd_event_source_set_enabled() failed. %m");
+                        return log_error_errno(r, "sd_event_source_set_enabled() failed: %m");
         }
 
         return 0;

diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c
index 21837b96ffe8714db6768a913a6008cbdfc9bc39..207609d232d184701146eea1f58f614e81c3ef49 100644 (file)
--- a/src/mountfsd/mountwork.c
+++ b/src/mountfsd/mountwork.c
@@ -1187,7 +1187,7 @@ static int run(int argc, char *argv[]) {
                                 if (r == -ESRCH)
                                         return log_error_errno(r, "Parent already died?");
                                 if (r < 0)
-                                        return log_error_errno(r, "Failed to send SIGUSR2 signal to parent. %m");
+                                        return log_error_errno(r, "Failed to send SIGUSR2 signal to parent: %m");
                         }
                 }
 

diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index 9427b1885ce5c8a421abf644b0d86bf3dad3c227..a648a72a07d96bd4c8d5e9a5276fb4ef64081b9a 100644 (file)
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -2069,7 +2069,7 @@ static int run(int argc, char *argv[]) {
                                 if (r == -ESRCH)
                                         return log_error_errno(r, "Parent already died?");
                                 if (r < 0)
-                                        return log_error_errno(r, "Failed to send SIGUSR2 signal to parent. %m");
+                                        return log_error_errno(r, "Failed to send SIGUSR2 signal to parent: %m");
                         }
                 }
 

diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c
index 4b0e4a54aab17e4eeb9e9b23b562e72004b99423..4f9808e5c3843a8443e0a7937919f361281fdf41 100644 (file)
--- a/src/oom/oomd-util.c
+++ b/src/oom/oomd-util.c
@@ -527,13 +527,13 @@ int oomd_system_context_acquire(const char *proc_meminfo_path, OomdSystemContext
 
         if (mem_available > ctx.mem_total)
                 return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "MemAvailable (%" PRIu64 ") cannot be greater than MemTotal (%" PRIu64 ") %m",
+                                       "MemAvailable (%" PRIu64 ") cannot be greater than MemTotal (%" PRIu64 ")",
                                        mem_available,
                                        ctx.mem_total);
 
         if (swap_free > ctx.swap_total)
                 return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "SwapFree (%" PRIu64 ") cannot be greater than SwapTotal (%" PRIu64 ") %m",
+                                       "SwapFree (%" PRIu64 ") cannot be greater than SwapTotal (%" PRIu64 ")",
                                        swap_free,
                                        ctx.swap_total);
 

diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c
index e8c44365d1a5a16d443e6142e83ee7047c1d132c..98539eac6f7271e02b1dfe8bfc8b2d981671795a 100644 (file)
--- a/src/resolve/resolved-mdns.c
+++ b/src/resolve/resolved-mdns.c
@@ -384,7 +384,7 @@ static int mdns_goodbye_callback(sd_event_source *s, uint64_t usec, void *userda
 
         r = mdns_notify_browsers_goodbye(scope);
         if (r < 0)
-                log_warning_errno(r, "mDNS: Failed to notify service subscribers of goodbyes, ignoring:  %m");
+                log_warning_errno(r, "mDNS: Failed to notify service subscribers of goodbyes, ignoring: %m");
 
         if (dns_cache_expiry_in_one_second(&scope->cache, usec)) {
                 r = sd_event_add_time_relative(

diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index 5e82a12504204fccd1f0c9784f2769bb8a402a69..1925f92e53658bdfe1e283a2dfa9fa6976a9d248 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -1538,7 +1538,7 @@ int seccomp_protect_syslog(void) {
                                 0);
 
                 if (r < 0) {
-                        log_debug_errno(r, "Failed to add syslog() rule for architecture %s, skipping %m", seccomp_arch_to_string(arch));
+                        log_debug_errno(r, "Failed to add syslog() rule for architecture %s, skipping: %m", seccomp_arch_to_string(arch));
                         continue;
                 }
 
@@ -1546,7 +1546,7 @@ int seccomp_protect_syslog(void) {
                 if (ERRNO_IS_NEG_SECCOMP_FATAL(r))
                         return r;
                 if (r < 0)
-                        log_debug_errno(r, "Failed to install syslog protection rules for architecture %s, skipping %m",
+                        log_debug_errno(r, "Failed to install syslog protection rules for architecture %s, skipping: %m",
                                         seccomp_arch_to_string(arch));
         }
 

diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c
index f2de3553dd85f18ad2f277a592e9f64a3b5e6802..6ebd807326aebe388a83ebe83c8fc41c83c8c509 100644 (file)
--- a/src/test/test-bpf-foreign-programs.c
+++ b/src/test/test-bpf-foreign-programs.c
@@ -249,12 +249,12 @@ static int test_bpf_cgroup_programs(Manager *m, const char *unit_name, const Tes
         ASSERT_OK(unit_patch_contexts(u));
         r = unit_start(u, NULL);
         if (r < 0)
-                return log_error_errno(r, "Unit start failed %m");
+                return log_error_errno(r, "Unit start failed: %m");
 
         while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED)) {
                 r = sd_event_run(m->event, UINT64_MAX);
                 if (r < 0)
-                        return log_error_errno(r, "Event run failed %m");
+                        return log_error_errno(r, "Event run failed: %m");
         }
 
         cld_code = SERVICE(u)->exec_command[SERVICE_EXEC_START]->exec_status.code;

diff --git a/src/test/test-bpf-restrict-fs.c b/src/test/test-bpf-restrict-fs.c
index 29a1470dc60ef3b6358bc355abf2e3de98da9b57..8450750c196d56b39ecb6d25a6f74787e89dc83f 100644 (file)
--- a/src/test/test-bpf-restrict-fs.c
+++ b/src/test/test-bpf-restrict-fs.c
@@ -41,12 +41,12 @@ static int test_restrict_filesystems(Manager *m, const char *unit_name, const ch
         ASSERT_OK(unit_patch_contexts(u));
         r = unit_start(u, NULL);
         if (r < 0)
-                return log_error_errno(r, "Unit start failed %m");
+                return log_error_errno(r, "Unit start failed: %m");
 
         while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED)) {
                 r = sd_event_run(m->event, UINT64_MAX);
                 if (r < 0)
-                        return log_error_errno(r, "Event run failed %m");
+                        return log_error_errno(r, "Event run failed: %m");
         }
 
         cld_code = SERVICE(u)->exec_command[SERVICE_EXEC_START]->exec_status.code;

diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c
index fec8269f2b155db3b6f92d38542d8a6754a02876..4e4fdbedd0fa9b62ceb4da8e0572e9b6204e6316 100644 (file)
--- a/src/test/test-socket-bind.c
+++ b/src/test/test-socket-bind.c
@@ -80,12 +80,12 @@ static int test_socket_bind(
         ASSERT_OK(unit_patch_contexts(u));
         r = unit_start(u, NULL);
         if (r < 0)
-                return log_error_errno(r, "Unit start failed %m");
+                return log_error_errno(r, "Unit start failed: %m");
 
         while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED)) {
                 r = sd_event_run(m->event, UINT64_MAX);
                 if (r < 0)
-                        return log_error_errno(r, "Event run failed %m");
+                        return log_error_errno(r, "Event run failed: %m");
         }
 
         cld_code = SERVICE(u)->exec_command[SERVICE_EXEC_START]->exec_status.code;