summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2011-02-21 15:32:17 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-28 22:47:38 +0100
commit35b8ca3aaf8cb044ad76675dfcad89e000dd4a5c (patch)
treec2cb5f22b38ea29d99e80df50f7b098f9020f1c4
parentsystemctl: always null-terminate the password (diff)
downloadsystemd-35b8ca3aaf8cb044ad76675dfcad89e000dd4a5c.tar.xz
systemd-35b8ca3aaf8cb044ad76675dfcad89e000dd4a5c.zip
Spelling Corrections
Just some lame spelling corrections with no functionality.
-rw-r--r--CODING_STYLE2
-rw-r--r--src/automount.c2
-rw-r--r--src/cgroups-agent.c2
-rw-r--r--src/dbus.c2
-rw-r--r--src/device.c4
-rw-r--r--src/device.h2
-rw-r--r--src/execute.c16
-rw-r--r--src/job.c2
-rw-r--r--src/log.c8
-rw-r--r--src/logger.c2
-rw-r--r--src/main.c4
-rw-r--r--src/manager.c8
-rw-r--r--src/manager.h4
-rw-r--r--src/namespace.c4
-rw-r--r--src/sd-daemon.h4
-rw-r--r--src/securebits.h2
-rw-r--r--src/service.c6
-rw-r--r--src/shutdown.c2
-rw-r--r--src/socket.c4
-rw-r--r--src/strv.c6
-rw-r--r--src/swap.h2
-rw-r--r--src/test-engine.c6
-rw-r--r--src/test-job-type.c2
-rw-r--r--src/tmpfiles.c2
-rw-r--r--src/tty-ask-password-agent.c4
-rw-r--r--src/unit-name.c2
-rw-r--r--src/unit.c4
-rw-r--r--src/unit.h4
28 files changed, 56 insertions, 56 deletions
diff --git a/CODING_STYLE b/CODING_STYLE
index 93f54f6edc..9341b48d41 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -20,7 +20,7 @@
we those lookups involve synchronously talking to services that we
would need to start up.
-- Do not acccess any directories outside of /etc/, /dev, /lib from the
+- Do not access any directories outside of /etc/, /dev, /lib from the
init daemon to avoid deadlocks with the automounter.
- Don't synchronously talk to any other service, due to risk of
diff --git a/src/automount.c b/src/automount.c
index c225c161eb..f6f83d43b6 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -583,7 +583,7 @@ static void automount_enter_runnning(Automount *a) {
/* Before we do anything, let's see if somebody is playing games with us? */
if (lstat(a->where, &st) < 0) {
- log_warning("%s failed stat automount point: %m", a->meta.id);
+ log_warning("%s failed to stat automount point: %m", a->meta.id);
goto fail;
}
diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 3fd0de698f..7b4fca245d 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
/* We send this event to the private D-Bus socket and then the
* system instance will forward this to the system bus. We do
- * this to avoid an actviation loop when we start dbus when we
+ * this to avoid an activation loop when we start dbus when we
* are called when the dbus service is shut down. */
if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
diff --git a/src/dbus.c b/src/dbus.c
index 64988c7ccc..965a3e2f21 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -418,7 +418,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus
goto oom;
}
- /* On success we don't do anything, the service will be spwaned now */
+ /* On success we don't do anything, the service will be spawned now */
}
}
diff --git a/src/device.c b/src/device.c
index b9d8a2b9cf..ccf2935a91 100644
--- a/src/device.c
+++ b/src/device.c
@@ -65,7 +65,7 @@ static void device_init(Unit *u) {
/* In contrast to all other unit types we timeout jobs waiting
* for devices by default. This is because they otherwise wait
- * indefinetely for plugged in devices, something which cannot
+ * indefinitely for plugged in devices, something which cannot
* happen for the other units since their operations time out
* anyway. */
d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
@@ -542,7 +542,7 @@ void device_fd_event(Manager *m, int events) {
if (!(dev = udev_monitor_receive_device(m->udev_monitor))) {
/*
* libudev might filter-out devices which pass the bloom filter,
- * so getting NULL here is not neccessarily an error
+ * so getting NULL here is not necessarily an error
*/
return;
}
diff --git a/src/device.h b/src/device.h
index ee50cfafc6..9a56a5205b 100644
--- a/src/device.h
+++ b/src/device.h
@@ -40,7 +40,7 @@ struct Device {
char *sysfs;
- /* In order to be able to distuingish dependencies on
+ /* In order to be able to distinguish dependencies on
different device nodes we might end up creating multiple
devices for the same sysfs path. We chain them up here. */
diff --git a/src/execute.c b/src/execute.c
index e01cbde974..d6f09e26fe 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -592,7 +592,7 @@ static int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const c
/* If there are multiple users with the same id, make
* sure to leave $USER to the configured value instead
- * of the first occurence in the database. However if
+ * of the first occurrence in the database. However if
* the uid was configured by a numeric uid, then let's
* pick the real username from /etc/passwd. */
if (*username && p)
@@ -617,7 +617,7 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_
assert(context);
- /* Lookup and ser GID and supplementary group list. Here too
+ /* Lookup and set GID and supplementary group list. Here too
* we avoid NSS lookups for gid=0. */
if (context->group || username) {
@@ -700,7 +700,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) {
/* First step: If we need to keep capabilities but
* drop privileges we need to make sure we keep our
- * caps, whiel we drop priviliges. */
+ * caps, whiel we drop privileges. */
if (uid != 0) {
int sb = context->secure_bits|SECURE_KEEP_CAPS;
@@ -709,7 +709,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) {
return -errno;
}
- /* Second step: set the capabilites. This will reduce
+ /* Second step: set the capabilities. This will reduce
* the capabilities to the minimum we need. */
if (!(d = cap_dup(context->capabilities)))
@@ -780,7 +780,7 @@ static int setup_pam(
assert(pam_env);
/* We set up PAM in the parent process, then fork. The child
- * will then stay around untill killed via PR_GET_PDEATHSIG or
+ * will then stay around until killed via PR_GET_PDEATHSIG or
* systemd via the cgroup logic. It will then remove the PAM
* session again. The parent process will exec() the actual
* daemon. We do things this way to ensure that the main PID
@@ -841,7 +841,7 @@ static int setup_pam(
/* Wait until our parent died. This will most likely
* not work since the kernel does not allow
- * unpriviliged paretns kill their priviliged children
+ * unprivileged parents kill their privileged children
* this way. We rely on the control groups kill logic
* to do the rest for us. */
if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
@@ -1242,7 +1242,7 @@ int exec_spawn(ExecCommand *command,
goto fail;
}
- /* PR_GET_SECUREBITS is not priviliged, while
+ /* PR_GET_SECUREBITS is not privileged, while
* PR_SET_SECUREBITS is. So to suppress
* potential EPERMs we'll try not to call
* PR_SET_SECUREBITS unless necessary. */
@@ -1779,7 +1779,7 @@ void exec_command_append_list(ExecCommand **l, ExecCommand *e) {
assert(e);
if (*l) {
- /* It's kinda important that we keep the order here */
+ /* It's kind of important, that we keep the order here */
LIST_FIND_TAIL(ExecCommand, command, *l, end);
LIST_INSERT_AFTER(ExecCommand, command, *l, end, e);
} else
diff --git a/src/job.c b/src/job.c
index 46577fdf7a..54bd4147e2 100644
--- a/src/job.c
+++ b/src/job.c
@@ -101,7 +101,7 @@ JobDependency* job_dependency_new(Job *subject, Job *object, bool matters, bool
/* Adds a new job link, which encodes that the 'subject' job
* needs the 'object' job in some way. If 'subject' is NULL
* this means the 'anchor' job (i.e. the one the user
- * explcitily asked for) is the requester. */
+ * explicitly asked for) is the requester. */
if (!(l = new0(JobDependency, 1)))
return NULL;
diff --git a/src/log.c b/src/log.c
index a2a648a93c..b6d4bf9c1b 100644
--- a/src/log.c
+++ b/src/log.c
@@ -45,7 +45,7 @@ static bool syslog_is_stream = false;
static bool show_color = false;
static bool show_location = false;
-/* Akin to glibc's __abort_msg; which is private and we hance cannot
+/* Akin to glibc's __abort_msg; which is private and we hence cannot
* use here. */
static char *log_abort_msg = NULL;
@@ -74,7 +74,7 @@ static int log_open_console(void) {
return console_fd;
}
- log_debug("Succesfully opened /dev/console for logging.");
+ log_debug("Successfully opened /dev/console for logging.");
} else
console_fd = STDERR_FILENO;
@@ -100,7 +100,7 @@ static int log_open_kmsg(void) {
return -errno;
}
- log_debug("Succesfully opened /dev/kmsg for logging.");
+ log_debug("Successfully opened /dev/kmsg for logging.");
return 0;
}
@@ -171,7 +171,7 @@ static int log_open_syslog(void) {
} else
syslog_is_stream = false;
- log_debug("Succesfully opened syslog for logging.");
+ log_debug("Successfully opened syslog for logging.");
return 0;
diff --git a/src/logger.c b/src/logger.c
index 510f4e223d..104d7c385b 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -520,7 +520,7 @@ static int server_init(Server *s, unsigned n_sockets) {
/* We use ev.data.ptr instead of ev.data.fd here,
* since on 64bit archs fd is 32bit while a pointer is
- * 64bit. To make sure we can easily distuingish fd
+ * 64bit. To make sure we can easily distinguish fd
* values and pointer values we want to make sure to
* write the full field unconditionally. */
diff --git a/src/main.c b/src/main.c
index fdac00f699..2c02217d89 100644
--- a/src/main.c
+++ b/src/main.c
@@ -858,7 +858,7 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds) {
assert(_fds);
if ((r = manager_open_serialization(m, &f)) < 0) {
- log_error("Failed to create serialization faile: %s", strerror(-r));
+ log_error("Failed to create serialization file: %s", strerror(-r));
goto fail;
}
@@ -974,7 +974,7 @@ int main(int argc, char *argv[]) {
char systemd[] = "systemd";
if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
- /* This is compatbility support for SysV, where
+ /* This is compatibility support for SysV, where
* calling init as a user is identical to telinit. */
errno = -ENOENT;
diff --git a/src/manager.c b/src/manager.c
index d77dc09617..194ad66a02 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -294,7 +294,7 @@ static unsigned manager_dispatch_cleanup_queue(Manager *m) {
}
enum {
- GC_OFFSET_IN_PATH, /* This one is on the path we were travelling */
+ GC_OFFSET_IN_PATH, /* This one is on the path we were traveling */
GC_OFFSET_UNSURE, /* No clue */
GC_OFFSET_GOOD, /* We still need this unit */
GC_OFFSET_BAD, /* We don't need this unit anymore */
@@ -768,7 +768,7 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) {
/* Tries to delete one item in the linked list
* j->transaction_next->transaction_next->... that conflicts
- * whith another one, in an attempt to make an inconsistent
+ * with another one, in an attempt to make an inconsistent
* transaction work. */
/* We rely here on the fact that if a merged with b does not
@@ -1286,7 +1286,7 @@ static int transaction_activate(Manager *m, JobMode mode, DBusError *e) {
break;
if (r != -EAGAIN) {
- log_warning("Requested transaction contains unmergable jobs: %s", bus_error(e, r));
+ log_warning("Requested transaction contains unmergeable jobs: %s", bus_error(e, r));
goto rollback;
}
@@ -1330,7 +1330,7 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool o
assert(m);
assert(unit);
- /* Looks for an axisting prospective job and returns that. If
+ /* Looks for an existing prospective job and returns that. If
* it doesn't exist it is created and added to the prospective
* jobs list. */
diff --git a/src/manager.h b/src/manager.h
index 19679686b1..efca4ff7f6 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -93,7 +93,7 @@ struct Watch {
struct Manager {
/* Note that the set of units we know of is allowed to be
- * incosistent. However the subset of it that is loaded may
+ * inconsistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
/* Active jobs and units */
@@ -194,7 +194,7 @@ struct Manager {
int gc_marker;
unsigned n_in_gc_queue;
- /* Make sure the user cannot accidentaly unmount our cgroup
+ /* Make sure the user cannot accidentally unmount our cgroup
* file system */
int pin_cgroupfs_fd;
diff --git a/src/namespace.c b/src/namespace.c
index 1d8f35ba57..54b22f494e 100644
--- a/src/namespace.c
+++ b/src/namespace.c
@@ -161,11 +161,11 @@ static int apply_mount(Path *p, const char *root_dir, const char *inaccessible_d
/* The bind mount will always inherit the original
* flags. If we want to set any flag we need
- * to do so in a second indepdant step. */
+ * to do so in a second independent step. */
if (flags)
r = mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|MS_REC|flags, NULL);
- /* Avoid expontial growth of trees */
+ /* Avoid exponential growth of trees */
if (r >= 0 && path_equal(p->path, "/"))
r = mount(NULL, where, NULL, MS_REMOUNT|MS_BIND|MS_UNBINDABLE|flags, NULL);
diff --git a/src/sd-daemon.h b/src/sd-daemon.h
index d0a0a9459a..4b853a15be 100644
--- a/src/sd-daemon.h
+++ b/src/sd-daemon.h
@@ -185,7 +185,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
READY=1 Tells systemd that daemon startup is finished (only
relevant for services of Type=notify). The passed
argument is a boolean "1" or "0". Since there is
- little value in signalling non-readiness the only
+ little value in signaling non-readiness the only
value daemons should send is "READY=1".
STATUS=... Passes a single-line status string back to systemd
@@ -206,7 +206,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
fork off the process itself. Example: "MAINPID=4711"
Daemons can choose to send additional variables. However, it is
- recommened to prefix variable names not listed above with X_.
+ recommended to prefix variable names not listed above with X_.
Returns a negative errno-style error code on failure. Returns > 0
if systemd could be notified, 0 if it couldn't possibly because
diff --git a/src/securebits.h b/src/securebits.h
index a5b99a3dbf..ba0bba5353 100644
--- a/src/securebits.h
+++ b/src/securebits.h
@@ -16,7 +16,7 @@
#define SECURE_NOROOT_LOCKED 1 /* make bit-0 immutable */
/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
- When unset, to provide compatiblility with old programs relying on
+ When unset, to provide compatibility with old programs relying on
set*uid to gain/lose privilege, transitions to/from uid 0 cause
capabilities to be gained/lost. */
#define SECURE_NO_SETUID_FIXUP 2
diff --git a/src/service.c b/src/service.c
index fef96e17dd..39a46d6cf5 100644
--- a/src/service.c
+++ b/src/service.c
@@ -335,7 +335,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
/* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target");
} else if (filename && streq(name, filename))
- /* Names equalling the file name of the services are redundant */
+ /* Names equaling the file name of the services are redundant */
return 0;
else
/* Everything else we assume to be normal service names */
@@ -2777,7 +2777,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
break;
case SERVICE_STOP_SIGKILL:
- /* Uh, wie sent a SIGKILL and it is still not gone?
+ /* Uh, we sent a SIGKILL and it is still not gone?
* Must be something we cannot kill, so let's just be
* weirded out and continue */
@@ -3052,7 +3052,7 @@ static int service_enumerate(Manager *m) {
/* We honour K links only for halt/reboot. For the normal
* runlevels we assume the stop jobs will be implicitly added
- * by the core logic. Also, we don't really distuingish here
+ * by the core logic. Also, we don't really distinguish here
* between the runlevels 0 and 6 and just add them to the
* special shutdown target. On SUSE the boot.d/ runlevel is
* also used for shutdown, so we add links for that too to the
diff --git a/src/shutdown.c b/src/shutdown.c
index 23b9f1b545..5c082cf4a5 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -334,7 +334,7 @@ int main(int argc, char *argv[]) {
}
if (retries >= FINALIZE_ATTEMPTS)
- log_error("Too many interations, giving up.");
+ log_error("Too many iterations, giving up.");
execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, NULL);
diff --git a/src/socket.c b/src/socket.c
index c41130ce72..96c649b0ab 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1363,7 +1363,7 @@ static int socket_start(Unit *u) {
if (s->service->meta.load_state != UNIT_LOADED)
return -ENOENT;
- /* If the service is alredy active we cannot start the
+ /* If the service is already active we cannot start the
* socket */
if (s->service->state != SERVICE_DEAD &&
s->service->state != SERVICE_FAILED &&
@@ -1798,7 +1798,7 @@ void socket_connection_unref(Socket *s) {
/* The service is dead. Yay!
*
- * This is strictly for one-onstance-per-connection
+ * This is strictly for one-instance-per-connection
* services. */
assert(s->n_connections > 0);
diff --git a/src/strv.c b/src/strv.c
index b1643b357f..c8ff5745e8 100644
--- a/src/strv.c
+++ b/src/strv.c
@@ -355,7 +355,7 @@ char **strv_remove(char **l, const char *s) {
if (!l)
return NULL;
- /* Drops every occurence of s in the string list */
+ /* Drops every occurrence of s in the string list */
for (f = t = l; *f; f++) {
@@ -379,7 +379,7 @@ static int env_append(char **r, char ***k, char **a) {
return 0;
/* Add the entries of a to *k unless they already exist in *r
- * in which case they are overriden instead. This assumes
+ * in which case they are overridden instead. This assumes
* there is enough space in the r array. */
for (; *a; a++) {
@@ -474,7 +474,7 @@ char **strv_env_delete(char **x, unsigned n_lists, ...) {
char **l, **k, **r, **j;
va_list ap;
- /* Deletes every entry fromx that is mentioned in the other
+ /* Deletes every entry from x that is mentioned in the other
* string lists */
n = strv_length(x);
diff --git a/src/swap.h b/src/swap.h
index c39caa6658..0d5c9a23f0 100644
--- a/src/swap.h
+++ b/src/swap.h
@@ -89,7 +89,7 @@ struct Swap {
Watch timer_watch;
- /* In order to be able to distuingish dependencies on
+ /* In order to be able to distinguish dependencies on
different device nodes we might end up creating multiple
devices for the same swap. We chain them up here. */
diff --git a/src/test-engine.c b/src/test-engine.c
index 157b7f9fda..60619b9d36 100644
--- a/src/test-engine.c
+++ b/src/test-engine.c
@@ -74,14 +74,14 @@ int main(int argc, char *argv[]) {
assert_se(manager_add_job(m, JOB_START, g, JOB_REPLACE, false, NULL, &j) == 0);
manager_dump_jobs(m, stdout, "\t");
- printf("Test7: (Unmeargable job type, fail)\n");
+ printf("Test7: (Unmergeable job type, fail)\n");
assert_se(manager_add_job(m, JOB_STOP, g, JOB_FAIL, false, NULL, &j) == -EEXIST);
printf("Test8: (Mergeable job type, fail)\n");
assert_se(manager_add_job(m, JOB_RESTART, g, JOB_FAIL, false, NULL, &j) == 0);
manager_dump_jobs(m, stdout, "\t");
- printf("Test9: (Unmeargable job type, replace)\n");
+ printf("Test9: (Unmergeable job type, replace)\n");
assert_se(manager_add_job(m, JOB_STOP, g, JOB_REPLACE, false, NULL, &j) == 0);
manager_dump_jobs(m, stdout, "\t");
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
assert_se(manager_load_unit(m, "h.service", NULL, NULL, &h) >= 0);
manager_dump_units(m, stdout, "\t");
- printf("Test10: (Unmeargable job type of auxiliary job, fail)\n");
+ printf("Test10: (Unmergeable job type of auxiliary job, fail)\n");
assert_se(manager_add_job(m, JOB_START, h, JOB_FAIL, false, NULL, &j) == 0);
manager_dump_jobs(m, stdout, "\t");
diff --git a/src/test-job-type.c b/src/test-job-type.c
index 9e2fc35f4e..9de21e1823 100644
--- a/src/test-job-type.c
+++ b/src/test-job-type.c
@@ -55,7 +55,7 @@ int main(int argc, char*argv[]) {
assert(!job_type_is_mergeable(b, c) || job_type_is_mergeable(d, c));
/* Verify that if a merged
- * with b is not mergable with
+ * with b is not mergeable with
* c then either a or b is not
* mergeable with c either. */
assert(job_type_is_mergeable(d, c) || !job_type_is_mergeable(a, c) || !job_type_is_mergeable(b, c));
diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 0302262394..0c3b88d35b 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -852,7 +852,7 @@ static int parse_argv(int argc, char *argv[]) {
}
if (!arg_clean && !arg_create && !arg_remove) {
- log_error("You need to specify at leat one of --clean, --create or --remove.");
+ log_error("You need to specify at least one of --clean, --create or --remove.");
return -EINVAL;
}
diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c
index ee7681a2c8..922dac3dc6 100644
--- a/src/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent.c
@@ -625,8 +625,8 @@ static int help(void) {
" -h --help Show this help\n"
" --list Show pending password requests\n"
" --query Process pending password requests\n"
- " --watch Continously process password requests\n"
- " --wall Continously forward password requests to wall\n"
+ " --watch Continuously process password requests\n"
+ " --wall Continuously forward password requests to wall\n"
" --plymouth Ask question with Plymouth instead of on TTY\n"
" --console Ask question on /dev/console instead of current TTY\n",
program_invocation_short_name);
diff --git a/src/unit-name.c b/src/unit-name.c
index debf2b2653..be4e73edcc 100644
--- a/src/unit-name.c
+++ b/src/unit-name.c
@@ -213,7 +213,7 @@ char *unit_name_build_escape(const char *prefix, const char *instance, const cha
* suffix and makes a nice string suitable as unit name of it,
* escaping all weird chars on the way.
*
- * / becomes ., and all chars not alloweed in a unit name get
+ * / becomes ., and all chars not allowed in a unit name get
* escaped as \xFF, including \ and ., of course. This
* escaping is hence reversible.
*
diff --git a/src/unit.c b/src/unit.c
index d75a06afc8..359cb2d084 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -736,7 +736,7 @@ int unit_add_default_target_dependency(Unit *u, Unit *target) {
if (target->meta.type != UNIT_TARGET)
return 0;
- /* Only add the dependency if boths units are loaded, so that
+ /* Only add the dependency if both units are loaded, so that
* that loop check below is reliable */
if (u->meta.load_state != UNIT_LOADED ||
target->meta.load_state != UNIT_LOADED)
@@ -1124,7 +1124,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
job_add_to_run_queue(u->meta.job);
/* Let's check whether this state change constitutes a
- * finished job, or maybe cotradicts a running job and
+ * finished job, or maybe contradicts a running job and
* hence needs to invalidate jobs. */
switch (u->meta.job->type) {
diff --git a/src/unit.h b/src/unit.h
index bd60dcb115..5f55a89da8 100644
--- a/src/unit.h
+++ b/src/unit.h
@@ -196,7 +196,7 @@ struct Meta {
/* Garbage collect us we nobody wants or requires us anymore */
bool stop_when_unneeded;
- /* Create default depedencies */
+ /* Create default dependencies */
bool default_dependencies;
/* Refuse manual starting, allow starting only indirectly via dependency. */
@@ -290,7 +290,7 @@ struct UnitVTable {
/* Returns the substate specific to this unit type as
* string. This is purely information so that we can give the
- * user a more finegrained explanation in which actual state a
+ * user a more fine grained explanation in which actual state a
* unit is in. */
const char* (*sub_state_to_string)(Unit *u);