From 3fe910794b60de8ae99b9e93b81463ace26d0f12 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Mon, 18 Jun 2018 22:43:12 +0200 Subject: [PATCH] Correct a number of trivial typos. --- src/core/dbus-manager.c | 2 +- src/core/execute.c | 2 +- src/core/main.c | 2 +- src/core/namespace.c | 2 +- src/core/unit.c | 2 +- src/journal/test-compress-benchmark.c | 2 +- src/libsystemd-network/sd-radv.c | 2 +- src/libsystemd/sd-event/test-event.c | 2 +- src/network/networkd-address-label.c | 2 +- src/network/networkd-manager.c | 8 ++++---- src/shared/machine-image.c | 2 +- src/system-update-generator/system-update-generator.c | 4 ++-- src/systemd/sd-radv.h | 2 +- src/test/test-procfs-util.c | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 1363804eac..4ed68af1e0 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1482,7 +1482,7 @@ static int method_switch_root(sd_bus_message *message, void *userdata, sd_bus_er if (available < RELOAD_DISK_SPACE_MIN) { char fb_available[FORMAT_BYTES_MAX], fb_need[FORMAT_BYTES_MAX]; - log_warning("Dangerously low amount of free space on /run/systemd, root switching operation might not complete successfuly. " + log_warning("Dangerously low amount of free space on /run/systemd, root switching operation might not complete successfully. " "Currently, %s are free, but %s are suggested. Proceeding anyway.", format_bytes(fb_available, sizeof(fb_available), available), format_bytes(fb_need, sizeof(fb_need), RELOAD_DISK_SPACE_MIN)); diff --git a/src/core/execute.c b/src/core/execute.c index aea53de3d5..8ac69d1a0f 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -4841,7 +4841,7 @@ int exec_runtime_deserialize_compat(Unit *u, const char *key, const char *value, if (rt_create) { r = hashmap_put(u->manager->exec_runtime_by_id, rt_create->id, rt_create); if (r < 0) { - log_unit_debug_errno(u, r, "Failed to put runtime paramter to manager's storage: %m"); + log_unit_debug_errno(u, r, "Failed to put runtime parameter to manager's storage: %m"); return 0; } diff --git a/src/core/main.c b/src/core/main.c index 7b77bf3d55..44dd8348be 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1641,7 +1641,7 @@ static int invoke_main_loop( log_info("Reloading."); - /* First, save any overriden log level/target, then parse the configuration file, which might + /* First, save any overridden log level/target, then parse the configuration file, which might * change the log level to new settings. */ saved_log_level = m->log_level_overridden ? log_get_max_level() : -1; diff --git a/src/core/namespace.c b/src/core/namespace.c index 8e771b3d88..e4930db15c 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -67,7 +67,7 @@ typedef struct MountEntry { } MountEntry; /* If MountAPIVFS= is used, let's mount /sys and /proc into the it, but only as a fallback if the user hasn't mounted - * something there already. These mounts are hence overriden by any other explicitly configured mounts. */ + * something there already. These mounts are hence overridden by any other explicitly configured mounts. */ static const MountEntry apivfs_table[] = { { "/proc", PROCFS, false }, { "/dev", BIND_DEV, false }, diff --git a/src/core/unit.c b/src/core/unit.c index e0485e1f46..113205bf25 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -5419,7 +5419,7 @@ int unit_pid_attachable(Unit *u, pid_t pid, sd_bus_error *error) { /* Some extra safety check */ if (pid == 1 || pid == getpid_cached()) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Process " PID_FMT " is a manager processs, refusing.", pid); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Process " PID_FMT " is a manager process, refusing.", pid); /* Don't even begin to bother with kernel threads */ r = is_kernel_thread(pid); diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c index dd53476898..411df3fa7a 100644 --- a/src/journal/test-compress-benchmark.c +++ b/src/journal/test-compress-benchmark.c @@ -132,7 +132,7 @@ static void test_compress_decompress(const char* label, const char* type, dt = (n2-n) / 1e6; log_info("%s/%s: compressed & decompressed %zu bytes in %.2fs (%.2fMiB/s), " - "mean compresion %.2f%%, skipped %zu bytes", + "mean compression %.2f%%, skipped %zu bytes", label, type, total, dt, total / 1024. / 1024 / dt, 100 - compressed * 100. / total, diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index 5f82e4b452..86750b876c 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -276,7 +276,7 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat r = radv_send(ra, &src, ra->lifetime); if (r < 0) - log_radv_warning_errno(r, "Unable to send solicited Router Advertisment to %s: %m", addr); + log_radv_warning_errno(r, "Unable to send solicited Router Advertisement to %s: %m", addr); else log_radv("Sent solicited Router Advertisement to %s", addr); diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c index fcb3599e89..bde00cf719 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/sd-event/test-event.c @@ -188,7 +188,7 @@ static void test_basic(void) { got_a = false, got_b = false, got_c = false, got_d = 0; - /* Add a oneshot handler, trigger it, re-enable it, and trigger + /* Add a oneshot handler, trigger it, reenable it, and trigger * it again. */ assert_se(sd_event_add_io(e, &w, d[0], EPOLLIN, io_handler, INT_TO_PTR('d')) >= 0); assert_se(sd_event_source_set_enabled(w, SD_EVENT_ONESHOT) >= 0); diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index 2f05cffbff..bd9667035e 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.c @@ -194,7 +194,7 @@ int config_parse_address_label( } if (k == 0xffffffffUL) { - log_syntax(unit, LOG_ERR, filename, line, r, "Adress label is invalid, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, r, "Address label is invalid, ignoring: %s", rvalue); return 0; } diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index a075bfe8b7..7ee6438a07 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -766,7 +766,7 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi } else if (r >= 0) { r = sd_rtnl_message_routing_policy_rule_get_rtm_src_prefixlen(message, &from_prefixlen); if (r < 0) { - log_warning_errno(r, "rtnl: failed to retrive rule from prefix length, ignoring: %m"); + log_warning_errno(r, "rtnl: failed to retrieve rule from prefix length, ignoring: %m"); return 0; } } @@ -778,7 +778,7 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi } else if (r >= 0) { r = sd_rtnl_message_routing_policy_rule_get_rtm_dst_prefixlen(message, &to_prefixlen); if (r < 0) { - log_warning_errno(r, "rtnl: failed to retrive rule to prefix length, ignoring: %m"); + log_warning_errno(r, "rtnl: failed to retrieve rule to prefix length, ignoring: %m"); return 0; } } @@ -793,7 +793,7 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi } else if (r >= 0) { r = sd_rtnl_message_routing_policy_rule_get_rtm_src_prefixlen(message, &from_prefixlen); if (r < 0) { - log_warning_errno(r, "rtnl: failed to retrive rule from prefix length, ignoring: %m"); + log_warning_errno(r, "rtnl: failed to retrieve rule from prefix length, ignoring: %m"); return 0; } } @@ -805,7 +805,7 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi } else if (r >= 0) { r = sd_rtnl_message_routing_policy_rule_get_rtm_dst_prefixlen(message, &to_prefixlen); if (r < 0) { - log_warning_errno(r, "rtnl: failed to retrive rule to prefix length, ignoring: %m"); + log_warning_errno(r, "rtnl: failed to retrieve rule to prefix length, ignoring: %m"); return 0; } } diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c index ff9a2103a0..00a5eff670 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.c @@ -500,7 +500,7 @@ int image_from_path(const char *path, Image **ret) { /* Note that we don't set the 'discoverable' field of the returned object, because we don't check here whether * the image is in the image search path. And if it is we don't know if the path we used is actually not - * overriden by another, different image earlier in the search path */ + * overridden by another, different image earlier in the search path */ if (path_equal(path, "/")) return image_make(".host", AT_FDCWD, NULL, "/", NULL, ret); diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index 6e1bb6c825..0f77042f48 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -43,9 +43,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat */ if (streq(key, "systemd.unit") && !proc_cmdline_value_missing(key, value)) - log_warning("Offline system update overriden by kernel command line systemd.unit= setting"); + log_warning("Offline system update overridden by kernel command line systemd.unit= setting"); else if (!value && runlevel_to_target(key)) - log_warning("Offline system update overriden by runlevel \"%s\" on the kernel command line", key); + log_warning("Offline system update overridden by runlevel \"%s\" on the kernel command line", key); return 0; } diff --git a/src/systemd/sd-radv.h b/src/systemd/sd-radv.h index f2056c0644..53c507d88c 100644 --- a/src/systemd/sd-radv.h +++ b/src/systemd/sd-radv.h @@ -41,7 +41,7 @@ _SD_BEGIN_DECLARATIONS; typedef struct sd_radv sd_radv; typedef struct sd_radv_prefix sd_radv_prefix; -/* Router Advertisment */ +/* Router Advertisement */ int sd_radv_new(sd_radv **ret); sd_radv *sd_radv_ref(sd_radv *ra); sd_radv *sd_radv_unref(sd_radv *ra); diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c index 10229de4e8..08af380cc7 100644 --- a/src/test/test-procfs-util.c +++ b/src/test/test-procfs-util.c @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { log_open(); assert_se(procfs_cpu_get_usage(&nsec) >= 0); - log_info("Current sytem CPU time: %s", format_timespan(buf, sizeof(buf), nsec/NSEC_PER_USEC, 1)); + log_info("Current system CPU time: %s", format_timespan(buf, sizeof(buf), nsec/NSEC_PER_USEC, 1)); assert_se(procfs_memory_get_current(&v) >= 0); log_info("Current memory usage: %s", format_bytes(buf, sizeof(buf), v));