summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorstein Husebø <torstein@huseboe.net>2016-05-04 11:26:17 +0200
committerLennart Poettering <lennart@poettering.net>2016-05-04 11:26:17 +0200
commitf8e2f4d6a0c6bcb5a03abe580d657b932cdb9798 (patch)
tree1599b9662a23b452a627d7d76400b4add0260157
parent1ed7ebcfcaa952441565c1c8c43084add1f58a89 (diff)
treewide: fix typos (#3187)
-rw-r--r--src/basic/fileio.c2
-rw-r--r--src/journal/journal-file.c2
-rw-r--r--src/journal/sd-journal.c2
-rw-r--r--src/resolve/resolved-dns-query.c2
-rw-r--r--src/shared/machine-image.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 2a9b6e46ad..29f5374222 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1337,7 +1337,7 @@ int link_tmpfile(int fd, const char *path, const char *target) {
* created with O_TMPFILE is assumed, and linkat() is used. Otherwise it is assumed O_TMPFILE is not supported
* on the directory, and renameat2() is used instead.
*
- * Note that in both cases we will not replace existing files. This is because linkat() dos not support this
+ * Note that in both cases we will not replace existing files. This is because linkat() does not support this
* operation currently (renameat2() does), and there is no nice way to emulate this. */
if (path) {
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index ec50333c2c..7504326bff 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -3160,7 +3160,7 @@ int journal_file_open(
goto fail;
}
- /* The file is opened now successfully, thus we take possesion of any passed in fd. */
+ /* The file is opened now successfully, thus we take possession of any passed in fd. */
f->close_fd = true;
*ret = f;
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 27c1dd346f..1cea68ad42 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1942,7 +1942,7 @@ _public_ int sd_journal_open_files_fd(sd_journal **ret, int fds[], unsigned n_fd
return 0;
fail:
- /* If we fail, make sure we don't take possession of the files we managed to make use of successfuly, and they
+ /* If we fail, make sure we don't take possession of the files we managed to make use of successfully, and they
* remain open */
ORDERED_HASHMAP_FOREACH(f, j->files, iterator)
f->close_fd = false;
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index 706f8c14ed..ea04e58d61 100644
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -810,7 +810,7 @@ static void dns_query_accept(DnsQuery *q, DnsQueryCandidate *c) {
switch (t->state) {
case DNS_TRANSACTION_SUCCESS: {
- /* We found a successfuly reply, merge it into the answer */
+ /* We found a successfully reply, merge it into the answer */
r = dns_answer_extend(&q->answer, t->answer);
if (r < 0)
goto fail;
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 66f58ecd92..529d89ee2a 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -487,7 +487,7 @@ int image_rename(Image *i, const char *new_name) {
/* Make sure nobody takes the new name, between the time we
* checked it is currently unused in all search paths, and the
- * time we take possesion of it */
+ * time we take possession of it */
r = image_name_lock(new_name, LOCK_EX|LOCK_NB, &name_lock);
if (r < 0)
return r;
@@ -588,7 +588,7 @@ int image_clone(Image *i, const char *new_name, bool read_only) {
/* Make sure nobody takes the new name, between the time we
* checked it is currently unused in all search paths, and the
- * time we take possesion of it */
+ * time we take possession of it */
r = image_name_lock(new_name, LOCK_EX|LOCK_NB, &name_lock);
if (r < 0)
return r;