From ff9b60f38bf68eba4a47cabff14547d92e083214 Mon Sep 17 00:00:00 2001 From: Torstein Husebø Date: Mon, 11 May 2015 13:49:29 +0200 Subject: treewide: Correct typos and spell plural of bus consistent --- src/analyze/analyze-verify.c | 2 +- src/core/dbus.c | 2 +- src/core/main.c | 2 +- src/core/manager.c | 2 +- src/gudev/gudevdevice.c | 2 +- src/libsystemd/libsystemd.sym.m4 | 2 +- src/libsystemd/sd-bus/bus-kernel.c | 2 +- src/libsystemd/sd-rtnl/rtnl-message.c | 2 +- src/locale/localectl.c | 4 ++-- src/shared/barrier.c | 2 +- src/systemctl/systemctl.c | 4 ++-- src/test/test-sleep.c | 2 +- src/udev/udev-builtin-keyboard.c | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c index bfc71e3f38..4145812bc7 100644 --- a/src/analyze/analyze-verify.c +++ b/src/analyze/analyze-verify.c @@ -226,7 +226,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man) r = manager_new(running_as, true, &m); if (r < 0) - return log_error_errno(r, "Failed to initalize manager: %m"); + return log_error_errno(r, "Failed to initialize manager: %m"); log_debug("Starting manager..."); diff --git a/src/core/dbus.c b/src/core/dbus.c index 4005aac7e7..1679242be8 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -1116,7 +1116,7 @@ int bus_foreach_bus( sd_bus *b; int r, ret = 0; - /* Send to all direct busses, unconditionally */ + /* Send to all direct buses, unconditionally */ SET_FOREACH(b, m->private_buses, i) { r = send_message(b, userdata); if (r < 0) diff --git a/src/core/main.c b/src/core/main.c index af28ac6b24..09436774c9 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1384,7 +1384,7 @@ int main(int argc, char *argv[]) { r = initialize_join_controllers(); if (r < 0) { - error_message = "Failed to initalize cgroup controllers"; + error_message = "Failed to initialize cgroup controllers"; goto finish; } diff --git a/src/core/manager.c b/src/core/manager.c index c918f191c9..dba945a1ea 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -753,7 +753,7 @@ static int manager_connect_bus(Manager *m, bool reexecuting) { reexecuting || (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS")); - /* Try to connect to the busses, if possible. */ + /* Try to connect to the buses, if possible. */ return bus_init(m, try_bus_connect); } diff --git a/src/gudev/gudevdevice.c b/src/gudev/gudevdevice.c index 5530d2c421..28b229b8d8 100644 --- a/src/gudev/gudevdevice.c +++ b/src/gudev/gudevdevice.c @@ -993,7 +993,7 @@ g_udev_device_get_tags (GUdevDevice *device) * g_udev_device_get_is_initialized: * @device: A #GUdevDevice. * - * Gets whether @device has been initalized. + * Gets whether @device has been initialized. * * Returns: Whether @device has been initialized. * diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4 index 72213c2297..b443c3cfba 100644 --- a/src/libsystemd/libsystemd.sym.m4 +++ b/src/libsystemd/libsystemd.sym.m4 @@ -63,7 +63,7 @@ global: sd_journal_open_files; sd_journal_open_container; - /* sd-dameon */ + /* sd-daemon */ sd_booted; sd_is_fifo; sd_is_mq; diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 8e3b64337c..d5cc8100ce 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -1593,7 +1593,7 @@ int bus_kernel_create_bus(const char *name, bool world, char **s) { make->size += ALIGN8(n->size); - /* The busses we create make no restrictions on what metadata + /* The buses we create make no restrictions on what metadata * peers can read from incoming messages. */ n = KDBUS_ITEM_NEXT(n); n->type = KDBUS_ITEM_ATTACH_FLAGS_RECV; diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index 4f994a10d3..bab2a4ff08 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -45,7 +45,7 @@ static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) { /* Note that 'rtnl' is currently unused, if we start using it internally we must take care to avoid problems due to mutual references between - busses and their queued messages. See sd-bus. + buses and their queued messages. See sd-bus. */ m = new0(sd_rtnl_message, 1); diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 515fca540a..8c60339e3e 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -77,7 +77,7 @@ typedef struct StatusInfo { const char *x11_options; } StatusInfo; -static void print_overriden_variables(void) { +static void print_overridden_variables(void) { int r; char *variables[_VARIABLE_LC_MAX] = {}; LocaleVariable j; @@ -176,7 +176,7 @@ static int show_status(sd_bus *bus, char **args, unsigned n) { goto fail; } - print_overriden_variables(); + print_overridden_variables(); print_status_info(&info); fail: diff --git a/src/shared/barrier.c b/src/shared/barrier.c index a0326ac697..436ba95989 100644 --- a/src/shared/barrier.c +++ b/src/shared/barrier.c @@ -138,7 +138,7 @@ int barrier_create(Barrier *b) { * barrier_create(). The object is released and reset to invalid * state. Therefore, it is safe to call barrier_destroy() multiple * times or even if barrier_create() failed. However, barrier must be - * always initalized with BARRIER_NULL. + * always initialized with BARRIER_NULL. * * If @b is NULL, this is a no-op. */ diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 4c45bfc1b8..e4b301af73 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5722,10 +5722,10 @@ static int get_file_to_edit(const char *name, const char *user_home, const char if (arg_runtime) { if (access(path, F_OK) >= 0) - return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.", + return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.", run, path); if (path2 && access(path2, F_OK) >= 0) - return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.", + return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.", run, path2); *ret_path = run; run = NULL; diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c index 1d75d05a88..4308ddfb64 100644 --- a/src/test/test-sleep.c +++ b/src/test/test-sleep.c @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { log_open(); if (getuid() != 0) - log_warning("This program is unlikely to work for unpriviledged users"); + log_warning("This program is unlikely to work for unprivileged users"); test_sleep(); diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index b6da734a3c..ed990c58fb 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -137,7 +137,7 @@ static void override_abs(int fd, const char *devnode, return; } - log_debug("keyboard: %x overriden with %"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32" for \"%s\"", + log_debug("keyboard: %x overridden with %"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32" for \"%s\"", evcode, absinfo.minimum, absinfo.maximum, absinfo.resolution, absinfo.fuzz, absinfo.flat, devnode); -- cgit v1.2.3-54-g00ecf