From 105a1a36cd6eeac3a43b5dd52383b00c69f86497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Mar 2020 15:00:53 +0100 Subject: [PATCH] tree-wide: fix spelling of lookup and setup verbs "set up" and "look up" are the verbs, "setup" and "lookup" are the nouns. --- src/core/dbus-manager.c | 2 +- src/core/namespace.c | 2 +- src/nspawn/nspawn.c | 2 +- src/resolve/resolved-dns-scope.c | 2 +- src/resolve/resolved-mdns.c | 2 +- src/shared/module-util.c | 2 +- src/systemctl/systemctl.c | 2 +- src/test/test-btrfs.c | 2 +- src/test/test-ns.c | 2 +- src/timesync/timesyncd-manager.c | 2 +- src/udev/udev-builtin-hwdb.c | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 46b6082a25..60f55aef5f 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1713,7 +1713,7 @@ static int method_get_dynamic_users(sd_bus_message *message, void *userdata, sd_ if (r == -EAGAIN) /* not realized yet? */ continue; if (r < 0) - return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Failed to lookup a dynamic user."); + return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Failed to look up a dynamic user."); r = sd_bus_message_append(reply, "(us)", uid, d->name); if (r < 0) diff --git a/src/core/namespace.c b/src/core/namespace.c index 07c9ac2b51..cda9d2ca1d 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -749,7 +749,7 @@ static int mount_private_dev(MountEntry *m) { r = dev_setup(temporary_mount, UID_INVALID, GID_INVALID); if (r < 0) - log_debug_errno(r, "Failed to setup basic device tree at '%s', ignoring: %m", temporary_mount); + log_debug_errno(r, "Failed to set up basic device tree at '%s', ignoring: %m", temporary_mount); /* Create the /dev directory if missing. It is more likely to be * missing when the service is started with RootDirectory. This is diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 2a63315a4c..f2f420c26f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3020,7 +3020,7 @@ static int inner_child( r = setup_dev_console(console); if (r < 0) - return log_error_errno(r, "Failed to setup /dev/console: %m"); + return log_error_errno(r, "Failed to set up /dev/console: %m"); r = send_one_fd(master_pty_socket, master, 0); if (r < 0) diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 691f07945f..d7e7b5a853 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -863,7 +863,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) { r = dns_zone_lookup(&s->zone, key, 0, &answer, &soa, &tentative); if (r < 0) { - log_debug_errno(r, "Failed to lookup key: %m"); + log_debug_errno(r, "Failed to look up key: %m"); return; } if (r == 0) diff --git a/src/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c index eba2978991..921720febf 100644 --- a/src/resolve/resolved-mdns.c +++ b/src/resolve/resolved-mdns.c @@ -195,7 +195,7 @@ static int mdns_scope_process_query(DnsScope *s, DnsPacket *p) { r = dns_zone_lookup(&s->zone, key, 0, &answer, &soa, &tentative); if (r < 0) - return log_debug_errno(r, "Failed to lookup key: %m"); + return log_debug_errno(r, "Failed to look up key: %m"); if (tentative && DNS_PACKET_NSCOUNT(p) > 0) { /* diff --git a/src/shared/module-util.c b/src/shared/module-util.c index 75c8ba2b78..9173cf2ffd 100644 --- a/src/shared/module-util.c +++ b/src/shared/module-util.c @@ -18,7 +18,7 @@ int module_load_and_warn(struct kmod_ctx *ctx, const char *module, bool verbose) r = kmod_module_new_from_lookup(ctx, module, &modlist); if (r < 0) return log_full_errno(verbose ? LOG_ERR : LOG_DEBUG, r, - "Failed to lookup module alias '%s': %m", module); + "Failed to look up module alias '%s': %m", module); if (!modlist) { log_full_errno(verbose ? LOG_ERR : LOG_DEBUG, r, diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 771ede7397..f44db4ffc3 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6590,7 +6590,7 @@ static int enable_sysv_units(const char *verb, char **args) { j = unit_file_exists(arg_scope, &paths, name); if (j < 0 && !IN_SET(j, -ELOOP, -ERFKILL, -EADDRNOTAVAIL)) - return log_error_errno(j, "Failed to lookup unit file state: %m"); + return log_error_errno(j, "Failed to look up unit file state: %m"); found_native = j != 0; /* If we have both a native unit and a SysV script, enable/disable them both (below); for is-enabled, diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index 5bd0e3458c..9dbe4dccd1 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) { r = btrfs_subvol_snapshot("/xxxquotatest", "/xxxquotatest2", BTRFS_SNAPSHOT_RECURSIVE|BTRFS_SNAPSHOT_QUOTA); if (r < 0) - log_error_errno(r, "Failed to setup snapshot: %m"); + log_error_errno(r, "Failed to set up snapshot: %m"); r = btrfs_qgroup_get_quota("/xxxquotatest2/beneath", 0, "a); if (r < 0) diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 48a5ff9f2d..cf8b08ba9b 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) { 0, NULL); if (r < 0) { - log_error_errno(r, "Failed to setup namespace: %m"); + log_error_errno(r, "Failed to set up namespace: %m"); log_info("Usage:\n" " sudo TEST_NS_PROJECTS=/home/lennart/projects ./test-ns\n" diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 7b71e98f56..e18e1e6c04 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -110,7 +110,7 @@ static int manager_send_request(Manager *m) { r = manager_listen_setup(m); if (r < 0) - return log_warning_errno(r, "Failed to setup connection socket: %m"); + return log_warning_errno(r, "Failed to set up connection socket: %m"); /* * Set transmit timestamp, remember it; the server will send that back diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 36cda504e7..8e86d2f0d1 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -163,7 +163,7 @@ static int builtin_hwdb(sd_device *dev, int argc, char *argv[], bool test) { if (argv[optind]) { r = udev_builtin_hwdb_lookup(dev, prefix, argv[optind], filter, test); if (r < 0) - return log_device_debug_errno(dev, r, "Failed to lookup hwdb: %m"); + return log_device_debug_errno(dev, r, "Failed to look up hwdb: %m"); if (r == 0) return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ENODATA), "No entry found from hwdb."); return r; @@ -178,7 +178,7 @@ static int builtin_hwdb(sd_device *dev, int argc, char *argv[], bool test) { r = udev_builtin_hwdb_search(dev, srcdev, subsystem, prefix, filter, test); if (r < 0) - return log_device_debug_errno(dev, r, "Failed to lookup hwdb: %m"); + return log_device_debug_errno(dev, r, "Failed to look up hwdb: %m"); if (r == 0) return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ENODATA), "No entry found from hwdb."); return r;