From: Yu Watanabe Date: Sat, 19 Jul 2025 00:02:02 +0000 (+0900) Subject: tree-wide: fix log messages: "Failed VERB" -> "Failed to VERB" X-Git-Tag: v258-rc1~9^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5918ba9c69f9bdc2e84092102b6617d8667b4f8a;p=thirdparty%2Fsystemd.git tree-wide: fix log messages: "Failed VERB" -> "Failed to VERB" --- diff --git a/src/boot/secure-boot.c b/src/boot/secure-boot.c index 84c86fe4249..3a3a7540091 100644 --- a/src/boot/secure-boot.c +++ b/src/boot/secure-boot.c @@ -120,7 +120,7 @@ EFI_STATUS secure_boot_enroll_at(EFI_FILE *root_dir, const char16_t *path, bool err = open_directory(root_dir, path, &dir); if (err != EFI_SUCCESS) - return log_error_status(err, "Failed opening keys directory %ls: %m", path); + return log_error_status(err, "Failed to open keys directory %ls: %m", path); struct { const char16_t *name; @@ -140,7 +140,7 @@ EFI_STATUS secure_boot_enroll_at(EFI_FILE *root_dir, const char16_t *path, bool FOREACH_ELEMENT(sb_var, sb_vars) { err = file_read(dir, sb_var->filename, 0, 0, &sb_var->buffer, &sb_var->size); if (err != EFI_SUCCESS && sb_var->required) { - log_error_status(err, "Failed reading file %ls\\%ls: %m", path, sb_var->filename); + log_error_status(err, "Failed to read file %ls\\%ls: %m", path, sb_var->filename); goto out_deallocate; } if (streq16(sb_var->name, u"PK") && sb_var->size > 20) { diff --git a/src/core/dbus.c b/src/core/dbus.c index 1659089dd94..e29354fd740 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -921,7 +921,7 @@ int bus_init_private(Manager *m) { r = sockaddr_un_set_path(&sa.un, p); } if (r < 0) - return log_error_errno(r, "Failed set socket path for private bus: %m"); + return log_error_errno(r, "Failed to set socket path for private bus: %m"); sa_len = r; (void) sockaddr_un_unlink(&sa.un); diff --git a/src/core/job.c b/src/core/job.c index bac12542dca..4291d366485 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -1199,7 +1199,7 @@ void job_add_to_run_queue(Job *j) { r = prioq_put(j->manager->run_queue, j, &j->run_queue_idx); if (r < 0) - log_warning_errno(r, "Failed put job in run queue, ignoring: %m"); + log_warning_errno(r, "Failed to put job in run queue, ignoring: %m"); else j->in_run_queue = true; diff --git a/src/core/socket.c b/src/core/socket.c index f7c61d2797b..f648721f057 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1578,7 +1578,7 @@ static int socket_address_listen_in_cgroup( r = unit_setup_exec_runtime(UNIT(s)); if (r < 0) - return log_unit_error_errno(UNIT(s), r, "Failed acquire runtime: %m"); + return log_unit_error_errno(UNIT(s), r, "Failed to acquire runtime: %m"); if (s->exec_context.network_namespace_path && s->exec_runtime && diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 8dd8439ab8c..9eef6248616 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -1556,7 +1556,7 @@ static int action_list_or_mtree_or_copy_or_make_archive(DissectedImage *m, LoopD * the mounts are done in a mount namespace there's not going to be a collision here */ r = get_common_dissect_directory(&t); if (r < 0) - return log_error_errno(r, "Failed generate private mount directory: %m"); + return log_error_errno(r, "Failed to generate private mount directory: %m"); r = dissected_image_mount_and_warn( m, diff --git a/src/home/homectl-pkcs11.c b/src/home/homectl-pkcs11.c index 38541c51ceb..3a0ae306232 100644 --- a/src/home/homectl-pkcs11.c +++ b/src/home/homectl-pkcs11.c @@ -135,7 +135,7 @@ static int add_pkcs11_encrypted_key( r = sd_json_variant_append_array(&l, e); if (r < 0) - return log_error_errno(r, "Failed append PKCS#11 encrypted key: %m"); + return log_error_errno(r, "Failed to append PKCS#11 encrypted key: %m"); r = sd_json_variant_set_field(&w, "pkcs11EncryptedKey", l); if (r < 0) diff --git a/src/home/homectl-recovery-key.c b/src/home/homectl-recovery-key.c index c8d6a9b2fa6..b71bf99c335 100644 --- a/src/home/homectl-recovery-key.c +++ b/src/home/homectl-recovery-key.c @@ -31,7 +31,7 @@ static int add_privileged(sd_json_variant **v, const char *hashed) { r = sd_json_variant_append_array(&l, e); if (r < 0) - return log_error_errno(r, "Failed append recovery key: %m"); + return log_error_errno(r, "Failed to append recovery key: %m"); r = sd_json_variant_set_field(&w, "recoveryKey", l); if (r < 0) diff --git a/src/home/homectl.c b/src/home/homectl.c index 166e7a71bb8..75235e1f40d 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -2623,7 +2623,7 @@ static int acquire_group_list(char ***ret) { if (r == -ESRCH) break; if (r < 0) - return log_debug_errno(r, "Failed acquire next group: %m"); + return log_debug_errno(r, "Failed to acquire next group: %m"); if (group_record_disposition(gr) == USER_REGULAR) { _cleanup_(user_record_unrefp) UserRecord *ur = NULL; diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c index 1a2195371a7..a34f0754999 100644 --- a/src/home/homework-cifs.c +++ b/src/home/homework-cifs.c @@ -49,7 +49,7 @@ int home_setup_cifs( r = parse_cifs_service(h->cifs_service, &chost, &cservice, &cdir); if (r < 0) - return log_error_errno(r, "Failed parse CIFS service specification: %m"); + return log_error_errno(r, "Failed to parse CIFS service specification: %m"); /* Just the host and service part, without the directory */ chost_and_service = strjoin("//", chost, "/", cservice); diff --git a/src/home/homework-fscrypt.c b/src/home/homework-fscrypt.c index bfcfb6774f0..be61d2b36f8 100644 --- a/src/home/homework-fscrypt.c +++ b/src/home/homework-fscrypt.c @@ -415,7 +415,7 @@ int home_setup_fscrypt( FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_LOG|FORK_WAIT|FORK_REOPEN_LOG, NULL); if (r < 0) - return log_error_errno(r, "Failed install encryption key in user's keyring: %m"); + return log_error_errno(r, "Failed to install encryption key in user's keyring: %m"); if (r == 0) { /* Child */ diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 2d6a549c225..e1b173a5855 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -2731,7 +2731,7 @@ static int prepare_resize_partition( r = sd_id128_from_string(disk_uuid_as_string, &disk_uuid); if (r < 0) - return log_error_errno(r, "Failed parse disk UUID: %m"); + return log_error_errno(r, "Failed to parse disk UUID: %m"); r = fdisk_get_partitions(c, &t); if (r < 0) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 326883bbe36..06fb3f28789 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -636,7 +636,7 @@ static const char* fallback_chassis_by_acpi(Context *c) { r = device_get_sysattr_unsigned(c->device_acpi, "pm_profile", &t); if (r < 0) { - log_debug_errno(r, "Failed read/parse ACPI PM profile, ignoring: %m"); + log_debug_errno(r, "Failed to read/parse ACPI PM profile, ignoring: %m"); return NULL; } diff --git a/src/import/import-fs.c b/src/import/import-fs.c index 22fddaa58bc..a132ab64f06 100644 --- a/src/import/import-fs.c +++ b/src/import/import-fs.c @@ -249,7 +249,7 @@ static int import_fs(int argc, char *argv[], void *userdata) { (arg_read_only ? INSTALL_READ_ONLY : 0) | (arg_sync ? INSTALL_SYNCFS : 0)); if (r < 0) - return log_error_errno(r, "Failed install directory as '%s': %m", final_path); + return log_error_errno(r, "Failed to install directory as '%s': %m", final_path); temp_path = mfree(temp_path); diff --git a/src/import/importd.c b/src/import/importd.c index 5289707ec8f..84cc9ca86ab 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -713,7 +713,7 @@ static int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_event_set_watchdog(m->event, true); if (r < 0) diff --git a/src/libsystemd/sd-journal/journal-vacuum.c b/src/libsystemd/sd-journal/journal-vacuum.c index 7301b72e950..9fcd1b277d0 100644 --- a/src/libsystemd/sd-journal/journal-vacuum.c +++ b/src/libsystemd/sd-journal/journal-vacuum.c @@ -255,7 +255,7 @@ int journal_directory_vacuum( r = journal_file_empty(dirfd(d), p); if (r < 0) { - log_debug_errno(r, "Failed check if %s is empty, ignoring: %m", p); + log_debug_errno(r, "Failed to check if %s is empty, ignoring: %m", p); continue; } if (r > 0) { diff --git a/src/libsystemd/sd-journal/test-journal-append.c b/src/libsystemd/sd-journal/test-journal-append.c index 6530cdae8fa..b155a7fd7eb 100644 --- a/src/libsystemd/sd-journal/test-journal-append.c +++ b/src/libsystemd/sd-journal/test-journal-append.c @@ -134,7 +134,7 @@ static int journal_corrupt_and_append(uint64_t start_offset, uint64_t step) { r = journal_append_message(mj, message); if (r < 0) { /* We care only about crashes or sanitizer errors, - * failed write without any crash is a success */ + * failing to write without any crash is a success */ log_info_errno(r, "Failed to write to the journal: %m"); break; } diff --git a/src/login/logind.c b/src/login/logind.c index c5819101e53..9427bae815a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -99,7 +99,7 @@ static int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); (void) sd_event_set_watchdog(m->event, true); diff --git a/src/mountfsd/mountfsd-manager.c b/src/mountfsd/mountfsd-manager.c index 0fe69b78332..c81671da32d 100644 --- a/src/mountfsd/mountfsd-manager.c +++ b/src/mountfsd/mountfsd-manager.c @@ -94,7 +94,7 @@ int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_event_set_watchdog(m->event, true); if (r < 0) @@ -182,7 +182,7 @@ static int start_one_worker(Manager *m) { } r = invoke_callout_binary(SYSTEMD_MOUNTWORK_PATH, STRV_MAKE("systemd-mountwork", "xxxxxxxxxxxxxxxx")); /* With some extra space rename_process() can make use of */ - log_error_errno(r, "Failed start worker process: %m"); + log_error_errno(r, "Failed to start worker process: %m"); _exit(EXIT_FAILURE); } diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 4b0263ea72a..bade74f3b09 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1693,7 +1693,7 @@ static int dhcp4_configure(Link *link) { if (link->network->dhcp_fallback_lease_lifetime_usec > 0) { r = sd_dhcp_client_set_fallback_lease_lifetime(link->dhcp_client, link->network->dhcp_fallback_lease_lifetime_usec); if (r < 0) - return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed set to lease lifetime: %m"); + return log_link_debug_errno(link, r, "DHCPv4 CLIENT: Failed to set fallback lease lifetime: %m"); } return dhcp4_set_client_identifier(link); diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 82aa1337fee..e7acf6d126c 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -539,7 +539,7 @@ int manager_setup(Manager *m) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_event_add_post(m->event, NULL, manager_post_handler, m); if (r < 0) diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 05cad27f91d..0f5df64ab46 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -685,7 +685,7 @@ int mount_all(const char *dest, log_debug_errno(r, "Failed to create directory %s: %m", where); - /* If we failed mkdir() or chown() due to the root directory being read only, + /* If mkdir() or chown() failed due to the root directory being read only, * attempt to mount this fs anyway and let mount_verbose log any errors */ if (r != -EROFS) continue; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 0bcf444b3ae..8013aa94c3e 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1366,7 +1366,7 @@ static int parse_argv(int argc, char *argv[]) { } else { r = read_full_file(optarg, (char**) &p, &l); if (r < 0) - return log_error_errno(r, "Failed parse root hash signature file '%s': %m", optarg); + return log_error_errno(r, "Failed to parse root hash signature file '%s': %m", optarg); } free_and_replace(arg_verity_settings.root_hash_sig, p); @@ -5583,7 +5583,7 @@ static int run_container( r = sd_event_add_memory_pressure(event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); /* Exit when the child exits */ (void) sd_event_add_signal(event, NULL, SIGCHLD, on_sigchld, pid); diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c index a3a8e0b5443..d58d88c7afd 100644 --- a/src/nsresourced/nsresourced-manager.c +++ b/src/nsresourced/nsresourced-manager.c @@ -114,7 +114,7 @@ int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_event_set_watchdog(m->event, true); if (r < 0) @@ -230,7 +230,7 @@ static int start_one_worker(Manager *m) { } r = invoke_callout_binary(SYSTEMD_NSRESOURCEWORK_PATH, STRV_MAKE("systemd-nsresourcework", "xxxxxxxxxxxxxxxx")); /* With some extra space rename_process() can make use of */ - log_error_errno(r, "Failed start worker process: %m"); + log_error_errno(r, "Failed to start worker process: %m"); _exit(EXIT_FAILURE); } diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c index f85119a2657..4c2ee6f20fe 100644 --- a/src/nsresourced/userns-restrict.c +++ b/src/nsresourced/userns-restrict.c @@ -40,7 +40,7 @@ static int make_inner_hash_map(void) { MOUNTS_MAX, NULL); if (fd < 0) - return log_debug_errno(errno, "Failed allocate inner BPF map: %m"); + return log_debug_errno(errno, "Failed to allocate inner BPF map: %m"); return fd; } diff --git a/src/portable/portabled.c b/src/portable/portabled.c index 6963e9b9771..65ceaf40b6d 100644 --- a/src/portable/portabled.c +++ b/src/portable/portabled.c @@ -50,7 +50,7 @@ static int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); (void) sd_event_set_watchdog(m->event, true); diff --git a/src/repart/repart.c b/src/repart/repart.c index 181555ce387..961d5d0e334 100644 --- a/src/repart/repart.c +++ b/src/repart/repart.c @@ -7601,7 +7601,7 @@ static int resolve_copy_blocks_auto( } } } else if (errno != ENOENT) - return log_error_errno(errno, "Failed open %s: %m", p); + return log_error_errno(errno, "Failed to open %s: %m", p); else { r = resolve_copy_blocks_auto_candidate(devno, type, restrict_devno, &found_uuid); if (r < 0) diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index b2fa0e3364b..66bd7982f5d 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -229,7 +229,7 @@ static int manager_process_route(sd_netlink *rtnl, sd_netlink_message *mm, void r = sd_netlink_message_get_type(mm, &type); if (r < 0) { - log_warning_errno(r, "Failed not get message type, ignoring: %m"); + log_warning_errno(r, "Failed to get rtnl message type, ignoring: %m"); return 0; } @@ -785,23 +785,23 @@ int manager_new(Manager **ret) { r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGHUP | SD_EVENT_SIGNAL_PROCMASK, manager_dispatch_reload_signal, m); if (r < 0) - return log_debug_errno(r, "Failed install SIGHUP handler: %m"); + return log_debug_errno(r, "Failed to install SIGHUP handler: %m"); r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGUSR1 | SD_EVENT_SIGNAL_PROCMASK, manager_sigusr1, m); if (r < 0) - return log_debug_errno(r, "Failed install SIGUSR1 handler: %m"); + return log_debug_errno(r, "Failed to install SIGUSR1 handler: %m"); r = sd_event_add_signal(m->event, /* ret= */ NULL, SIGUSR2 | SD_EVENT_SIGNAL_PROCMASK, manager_sigusr2, m); if (r < 0) - return log_debug_errno(r, "Failed install SIGUSR2 handler: %m"); + return log_debug_errno(r, "Failed to install SIGUSR2 handler: %m"); r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+1) | SD_EVENT_SIGNAL_PROCMASK, manager_sigrtmin1, m); if (r < 0) - return log_debug_errno(r, "Failed install SIGRTMIN+1 handler: %m"); + return log_debug_errno(r, "Failed to install SIGRTMIN+1 handler: %m"); r = sd_event_add_signal(m->event, /* ret= */ NULL, (SIGRTMIN+18) | SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, &m->sigrtmin18_info); if (r < 0) - return log_debug_errno(r, "Failed install SIGRTMIN+18 handler: %m"); + return log_debug_errno(r, "Failed to install SIGRTMIN+18 handler: %m"); manager_cleanup_saved_user(m); diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c index 384b19293a3..c54349b9f7d 100644 --- a/src/shared/creds-util.c +++ b/src/shared/creds-util.c @@ -178,7 +178,7 @@ int read_credential_with_decryption(const char *name, void **ret, size_t *ret_si if (r >= 0) return 1; /* found */ if (!IN_SET(r, -ENXIO, -ENOENT)) - return log_error_errno(r, "Failed read unencrypted credential '%s': %m", name); + return log_error_errno(r, "Failed to read unencrypted credential '%s': %m", name); r = get_encrypted_credentials_dir(&d); if (r == -ENXIO) @@ -920,7 +920,7 @@ int encrypt_credential_and_warn( r = tpm2_load_pcr_public_key(tpm2_pubkey_path, &pubkey.iov_base, &pubkey.iov_len); if (r < 0) { if (tpm2_pubkey_path || r != -ENOENT || !sd_id128_in_set(with_key, _CRED_AUTO, _CRED_AUTO_INITRD, _CRED_AUTO_SCOPED)) - return log_error_errno(r, "Failed read TPM PCR public key: %m"); + return log_error_errno(r, "Failed to read TPM PCR public key: %m"); log_debug_errno(r, "Failed to read TPM2 PCR public key, proceeding without: %m"); } diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 72165910f1a..024e16d68bf 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -4584,7 +4584,7 @@ int mountfsd_mount_image( if (image_policy) { r = image_policy_to_string(image_policy, /* simplify= */ false, &ps); if (r < 0) - return log_error_errno(r, "Failed format image policy to string: %m"); + return log_error_errno(r, "Failed to format image policy to string: %m"); } sd_json_variant *reply = NULL; diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index d5106dbb547..20d34631003 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -1141,7 +1141,7 @@ static int tpm2_credit_random(Tpm2Context *c) { r = random_write_entropy(-1, buffer->buffer, buffer->size, /* credit= */ false); if (r < 0) - return log_debug_errno(r, "Failed wo write entropy to kernel: %m"); + return log_debug_errno(r, "Failed to write entropy to kernel: %m"); done += buffer->size; rps = LESS_BY(rps, buffer->size); diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 97a835b8c85..f5f57180328 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -1547,7 +1547,7 @@ static int store_info_in_meta( /* Make sure the top-level dir has an mtime marking the point we established the merge */ if (utimensat(AT_FDCWD, meta_path, NULL, AT_SYMLINK_NOFOLLOW) < 0) - return log_error_errno(r, "Failed fix mtime of '%s': %m", meta_path); + return log_error_errno(r, "Failed to fix mtime of '%s': %m", meta_path); return 0; } diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c index cb2b05b901a..4060deeddf5 100644 --- a/src/sysupdate/sysupdate-resource.c +++ b/src/sysupdate/sysupdate-resource.c @@ -327,7 +327,7 @@ static int download_manifest( manifest = fdopen(pfd[0], "r"); if (!manifest) - return log_error_errno(errno, "Failed allocate FILE object for manifest file: %m"); + return log_error_errno(errno, "Failed to allocate FILE object for manifest file: %m"); TAKE_FD(pfd[0]); diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c index d3e71bb21ed..82fd931dab7 100644 --- a/src/sysupdate/sysupdate-transfer.c +++ b/src/sysupdate/sysupdate-transfer.c @@ -409,7 +409,7 @@ static int config_parse_resource_ptype( r = gpt_partition_type_from_string(rvalue, &rr->partition_type); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, - "Failed parse partition type, ignoring: %s", rvalue); + "Failed to parse partition type, ignoring: %s", rvalue); return 0; } @@ -437,7 +437,7 @@ static int config_parse_partition_uuid( r = sd_id128_from_string(rvalue, &t->partition_uuid); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, - "Failed parse partition UUID, ignoring: %s", rvalue); + "Failed to parse partition UUID, ignoring: %s", rvalue); return 0; } @@ -465,7 +465,7 @@ static int config_parse_partition_flags( r = safe_atou64(rvalue, &t->partition_flags); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, - "Failed parse partition flags, ignoring: %s", rvalue); + "Failed to parse partition flags, ignoring: %s", rvalue); return 0; } diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c index a46e4fdafcc..cc45ca0657f 100644 --- a/src/sysupdate/sysupdated.c +++ b/src/sysupdate/sysupdated.c @@ -1738,7 +1738,7 @@ static int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_bus_default_system(&m->bus); if (r < 0) diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index d81c129d65e..b3fcf8068ec 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -192,11 +192,11 @@ int main(int argc, char *argv[]) { r = btrfs_subvol_remove("/xxxquotatest", BTRFS_REMOVE_QUOTA|BTRFS_REMOVE_RECURSIVE); if (r < 0) - log_error_errno(r, "Failed remove subvolume: %m"); + log_error_errno(r, "Failed to remove subvolume: %m"); r = btrfs_subvol_remove("/xxxquotatest2", BTRFS_REMOVE_QUOTA|BTRFS_REMOVE_RECURSIVE); if (r < 0) - log_error_errno(r, "Failed remove subvolume: %m"); + log_error_errno(r, "Failed to remove subvolume: %m"); return 0; } diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c index a1fdac63e57..4651998ef1c 100644 --- a/src/test/test-loop-block.c +++ b/src/test/test-loop-block.c @@ -90,7 +90,7 @@ static void* thread_func(void *ptr) { DISSECT_IMAGE_READ_ONLY|DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected); if (r < 0) - log_error_errno(r, "Failed dissect loopback device %s: %m", loop->node); + log_error_errno(r, "Failed to dissect loopback device %s: %m", loop->node); assert_se(r >= 0); log_info("Dissected loop device %s", loop->node); diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 012b61d5130..6351179a62e 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1143,7 +1143,7 @@ int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_event_set_watchdog(m->event, true); if (r < 0) diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index 0c366714174..f16d835f8a7 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -490,7 +490,7 @@ static int display_user(int argc, char *argv[], void *userdata) { if (r == -EHOSTDOWN) return log_error_errno(r, "Selected user database service is not available for this request."); if (r < 0) - return log_error_errno(r, "Failed acquire next user: %m"); + return log_error_errno(r, "Failed to acquire next user: %m"); if (draw_separator && arg_output == OUTPUT_FRIENDLY) putchar('\n'); @@ -830,7 +830,7 @@ static int display_group(int argc, char *argv[], void *userdata) { if (r == -EHOSTDOWN) return log_error_errno(r, "Selected group database service is not available for this request."); if (r < 0) - return log_error_errno(r, "Failed acquire next group: %m"); + return log_error_errno(r, "Failed to acquire next group: %m"); if (draw_separator && arg_output == OUTPUT_FRIENDLY) putchar('\n'); @@ -977,7 +977,7 @@ static int display_memberships(int argc, char *argv[], void *userdata) { if (r == -EHOSTDOWN) return log_error_errno(r, "Selected membership database service is not available for this request."); if (r < 0) - return log_error_errno(r, "Failed acquire next membership: %m"); + return log_error_errno(r, "Failed to acquire next membership: %m"); r = show_membership(user, group, table); if (r < 0) @@ -1004,7 +1004,7 @@ static int display_memberships(int argc, char *argv[], void *userdata) { if (r == -EHOSTDOWN) return log_error_errno(r, "Selected membership database service is not available for this request."); if (r < 0) - return log_error_errno(r, "Failed acquire next membership: %m"); + return log_error_errno(r, "Failed to acquire next membership: %m"); r = show_membership(user, group, table); if (r < 0) diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c index 6e0d5e4a2a0..1c62bb1697b 100644 --- a/src/userdb/userdbd-manager.c +++ b/src/userdb/userdbd-manager.c @@ -103,7 +103,7 @@ int manager_new(Manager **ret) { r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); r = sd_event_set_watchdog(m->event, true); if (r < 0) @@ -198,7 +198,7 @@ static int start_one_worker(Manager *m) { } r = invoke_callout_binary(SYSTEMD_USERWORK_PATH, STRV_MAKE(SYSTEMD_USERWORK_PATH, "xxxxxxxxxxxxxxxx")); /* With some extra space rename_process() can make use of */ - log_error_errno(r, "Failed start worker process: %m"); + log_error_errno(r, "Failed to start worker process: %m"); _exit(EXIT_FAILURE); } diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 29276e556a0..e3e7a7c40c7 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -1616,7 +1616,7 @@ static int grow_image(const char *path, uint64_t size) { } if (ftruncate(fd, size) < 0) - return log_error_errno(errno, "Failed grow image file '%s' from %s to %s: %m", path, + return log_error_errno(errno, "Failed to grow image file '%s' from %s to %s: %m", path, FORMAT_BYTES(st.st_size), FORMAT_BYTES(size)); r = fsync_full(fd); @@ -2691,7 +2691,7 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) { r = sd_event_add_memory_pressure(event, NULL, NULL, NULL); if (r < 0) - log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m"); + log_debug_errno(r, "Failed to allocate memory pressure event source, ignoring: %m"); /* Exit when the child exits */ r = event_add_child_pidref(event, /* ret= */ NULL, &child_pidref, WEXITED, on_child_exit, /* userdata= */ NULL);