summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/basic/macro.h2
-rw-r--r--src/basic/mountpoint-util.c4
-rw-r--r--src/dissect/dissect.c2
-rw-r--r--src/shared/image-policy.c2
-rw-r--r--src/shared/varlink.c6
5 files changed, 8 insertions, 8 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 2770d01aa9..99262e9206 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -431,7 +431,7 @@ assert_cc(sizeof(dummy_t) == 0);
})
/* Iterate through each variadic arg. All must be the same type as 'entry' or must be implicitly
- * convertable. The iteration variable 'entry' must already be defined. */
+ * convertible. The iteration variable 'entry' must already be defined. */
#define VA_ARGS_FOREACH(entry, ...) \
_VA_ARGS_FOREACH(entry, UNIQ_T(_entries_, UNIQ), UNIQ_T(_current_, UNIQ), ##__VA_ARGS__)
#define _VA_ARGS_FOREACH(entry, _entries_, _current_, ...) \
diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
index db36b2f2f6..698ea65d48 100644
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@ -95,7 +95,7 @@ int name_to_handle_at_loop(
/* The buffer was too small. Size the new buffer by what name_to_handle_at() returned. */
n = h->handle_bytes;
- /* paranoia: check for overlow (note that .handle_bytes is unsigned only) */
+ /* paranoia: check for overflow (note that .handle_bytes is unsigned only) */
if (n > UINT_MAX - offsetof(struct file_handle, f_handle))
return -EOVERFLOW;
}
@@ -722,7 +722,7 @@ int mount_option_supported(const char *fstype, const char *key, const char *valu
_cleanup_close_ int fd = -EBADF;
int r;
- /* Checks if the specified file system supports a mount option. Returns > 0 if it suppors it, == 0 if
+ /* Checks if the specified file system supports a mount option. Returns > 0 if it supports it, == 0 if
* it does not. Return -EAGAIN if we can't determine it. And any other error otherwise. */
assert(fstype);
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index ab9d796cf4..2d33a967ca 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -1089,7 +1089,7 @@ static const char *pick_color_for_uid_gid(uid_t uid) {
if (uid_is_system(uid))
return ansi_normal(); /* files in disk images are typically owned by root and other system users, no issue there */
if (uid_is_dynamic(uid))
- return ansi_highlight_red(); /* files should never be owned persistently by dynamic users, and there are just no execuses */
+ return ansi_highlight_red(); /* files should never be owned persistently by dynamic users, and there are just no excuses */
if (uid_is_container(uid))
return ansi_highlight_cyan();
diff --git a/src/shared/image-policy.c b/src/shared/image-policy.c
index 3c1f924a87..bccd55406e 100644
--- a/src/shared/image-policy.c
+++ b/src/shared/image-policy.c
@@ -705,7 +705,7 @@ const ImagePolicy image_policy_sysext_strict = {
};
const ImagePolicy image_policy_confext = {
- /* For configuraiton extensions, honour root file system, and ignore everything else. After all, we
+ /* For configuration extensions, honour root file system, and ignore everything else. After all, we
* are only interested in the /etc/ tree anyway, and that's really the only place it can be. */
.n_policies = 1,
.policies = {
diff --git a/src/shared/varlink.c b/src/shared/varlink.c
index d15f50dbb2..6b985a4c9b 100644
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@@ -146,7 +146,7 @@ struct Varlink {
/* Further messages to output not yet formatted into text, and thus not included in output_buffer
* yet. We keep them separate from output_buffer, to not violate fd message boundaries: we want that
* each fd that is sent is associated with its fds, and that fds cannot be accidentally associated
- * with preceeding or following messages. */
+ * with preceding or following messages. */
LIST_HEAD(VarlinkJsonQueueItem, output_queue);
VarlinkJsonQueueItem *output_queue_tail;
@@ -1502,7 +1502,7 @@ static int varlink_enqueue_json(Varlink *v, JsonVariant *m) {
assert(v);
assert(m);
- /* If ther are no file descriptors to be queued and no queue entries yet we can shortcut things and
+ /* If there are no file descriptors to be queued and no queue entries yet we can shortcut things and
* append this entry directly to the output buffer */
if (v->n_pushed_fds == 0 && !v->output_queue)
return varlink_format_json(v, m);
@@ -2351,7 +2351,7 @@ int varlink_reset_fds(Varlink *v) {
int varlink_peek_fd(Varlink *v, size_t i) {
assert_return(v, -EINVAL);
- /* Returns one of the file descriptors that were received along witht the current message. This does
+ /* Returns one of the file descriptors that were received along with the current message. This does
* not duplicate the fd nor invalidate it, it hence remains in our possession. */
if (!v->allow_fd_passing_input)