From 627cdcc785530e0efad4dccd85c600c9ebfdaa50 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 12 Jul 2023 10:14:50 +0900 Subject: [PATCH] tree-wide: fix typos reported by Fossies Codespell report --- NEWS | 2 +- TODO | 4 ++-- docs/NETWORK_ONLINE.md | 2 +- man/sd_journal_open.xml | 2 +- src/basic/virt.c | 2 +- src/core/execute.c | 2 +- src/import/pull-job.c | 4 ++-- src/journal/journalctl.c | 2 +- src/shared/async.c | 2 +- src/shared/cgroup-setup.c | 2 +- src/shared/creds-util.c | 2 +- src/shared/tpm2-util.c | 4 ++-- test/units/testsuite-04.journal.sh | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 17cfd37b8d3..185126f6448 100644 --- a/NEWS +++ b/NEWS @@ -589,7 +589,7 @@ CHANGES WITH 254 in spe: more resilient in case of network problems. * resolvectl gained a new verb "show-cache" to show the current cache - contents of systemd-resolved. This verb comunicates with the + contents of systemd-resolved. This verb communicates with the systemd-resolved daemon and requires privileges. Other: diff --git a/TODO b/TODO index f691a36e09f..cbdac95fe0e 100644 --- a/TODO +++ b/TODO @@ -359,7 +359,7 @@ Features: activation we'd simply set up a dm-linear mapping to merge them again. A partition that is to be extended would just set a bit in the partition flags field to indicate that there's another extension partition to look for. The - identifiying UUID of the extension partition would be hashed in counter mode + identifying UUID of the extension partition would be hashed in counter mode from the uuid of the original partition it extends. Inspiration for this is the "dynamic partitions" concept of new Android. This would be a minimalistic concept of a volume manager, with the extents it manages being exposes as GPT @@ -400,7 +400,7 @@ Features: changed ("stepped"), and in timesyncd whenever we acquire an NTP fix ("slewing"). Then, in journalctl for each boot time we come across, find these records, and use the structured info they include to display - "corrected" wallclock time, as calculted from the monotonic timestamp in the + "corrected" wallclock time, as calculated from the monotonic timestamp in the log record, adjusted by the delta declared in the structured log record. * in journald: whenever we start a new journal file because the boot ID diff --git a/docs/NETWORK_ONLINE.md b/docs/NETWORK_ONLINE.md index e97d8f4f309..4700ef5b15e 100644 --- a/docs/NETWORK_ONLINE.md +++ b/docs/NETWORK_ONLINE.md @@ -45,7 +45,7 @@ themselves. Services using the network should hence simply place an `After=network.target` stanza in their unit files, without `Wants=network.target` or `Requires=network.target`. -## Network connectivity has been estabilished: `network-online.target` +## Network connectivity has been established: `network-online.target` `network-online.target` is a target that actively waits until the network is "up", where the definition of "up" is defined by the network management diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index 8b7035fcc28..0c4b1a7d5ab 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -137,7 +137,7 @@ sd_journal_open_directory_fd() is similar to sd_journal_open_directory(), but takes a file descriptor referencing a directory in the file - system instead of an absolute file system path. In addtion to the flags accepted by + system instead of an absolute file system path. In addition to the flags accepted by sd_journal_open_directory(), this function also accepts SD_JOURNAL_TAKE_DIRECTORY_FD. If SD_JOURNAL_TAKE_DIRECTORY_FD is specified, the function will take the ownership of the specified file descriptor on success, and it will be diff --git a/src/basic/virt.c b/src/basic/virt.c index 1fef114bc8d..e8f6a2fe47b 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -209,7 +209,7 @@ static Virtualization detect_vm_dmi_vendor(void) { } static int detect_vm_smbios(void) { - /* The SMBIOS BIOS Charateristics Extension Byte 2 (Section 2.1.2.2 of + /* The SMBIOS BIOS Characteristics Extension Byte 2 (Section 2.1.2.2 of * https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.4.0.pdf), specifies that * the 4th bit being set indicates a VM. The BIOS Characteristics table is exposed via the kernel in * /sys/firmware/dmi/entries/0-0. Note that in the general case, this bit being unset should not diff --git a/src/core/execute.c b/src/core/execute.c index 445983bfb62..abedd8f5098 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2519,7 +2519,7 @@ static int setup_exec_directory( * didn't know the more recent addition to the xdg-basedir spec: the $XDG_STATE_HOME * directory. In older systemd versions EXEC_DIRECTORY_STATE was aliased to * EXEC_DIRECTORY_CONFIGURATION, with the advent of $XDG_STATE_HOME is is now - * seperated. If a service has both dirs configured but only the configuration dir + * separated. If a service has both dirs configured but only the configuration dir * exists and the state dir does not, we assume we are looking at an update * situation. Hence, create a compatibility symlink, so that all expectations are * met. diff --git a/src/import/pull-job.c b/src/import/pull-job.c index d8402f753e6..8dd8ac09158 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.c @@ -250,8 +250,8 @@ void pull_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) { if (j->offset == UINT64_MAX) { if (j->written_compressed > 0) { - /* Make sure the file size is right, in case the file was sparse and we just seeked - * for the last part */ + /* Make sure the file size is right, in case the file was sparse and + * we just moved to the last part. */ if (ftruncate(j->disk_fd, j->written_uncompressed) < 0) { r = log_error_errno(errno, "Failed to truncate file: %m"); goto finish; diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index c70b98a3b1e..000baae0dfe 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1242,7 +1242,7 @@ static int discover_next_boot( return r; /* We iterate through this in a loop, until the boot ID differs from the previous one. Note that - * normally, this will only require a single iteration, as we seeked to the last entry of the previous + * normally, this will only require a single iteration, as we moved to the last entry of the previous * boot entry already. However, it might happen that the per-journal-field entry arrays are less * complete than the main entry array, and hence might reference an entry that's not actually the last * one of the boot ID as last one. Let's hence use the per-field array is initial seek position to diff --git a/src/shared/async.c b/src/shared/async.c index 6af63d7a9cb..41f6b97e028 100644 --- a/src/shared/async.c +++ b/src/shared/async.c @@ -128,7 +128,7 @@ int asynchronous_rm_rf(const char *p, RemoveFlags flags) { r = rm_rf(p, flags); if (r < 0) { log_debug_errno(r, "Failed to rm -rf '%s', ignoring: %m", p); - _exit(EXIT_FAILURE); /* This is a detached process, hence noone really cares, but who knows + _exit(EXIT_FAILURE); /* This is a detached process, hence no one really cares, but who knows * maybe it's good for debugging/tracing to return an exit code * indicative of our failure here. */ } diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c index 6f3f9dd939e..1dc56b11add 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c @@ -263,7 +263,7 @@ int cg_trim(const char *controller, const char *path, bool delete_root) { else if (r < 0) log_debug_errno(r, "Failed to iterate through cgroup %s: %m", path); - /* If we shall delete the top-level cgroup, then propagate the faiure to do so (except if it is + /* If we shall delete the top-level cgroup, then propagate the failure to do so (except if it is * already gone anyway). Also, let's debug log about this failure, except if the error code is an * expected one. */ if (delete_root && !empty_or_root(path) && diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c index f54481e9b46..40d6bc9514f 100644 --- a/src/shared/creds-util.c +++ b/src/shared/creds-util.c @@ -140,7 +140,7 @@ int read_credential_with_decryption(const char *name, void **ret, size_t *ret_si * yet. * * Note that read_credential_harder_and_warn() logs on its own, while read_credential() does not! - * (It's a lot more complex and error prone given its TPM2 connectivty, and is generally called from + * (It's a lot more complex and error prone given its TPM2 connectivity, and is generally called from * generators only where logging is OK). * * Error handling is also a bit different: if we can't find a credential we'll return 0 and NULL diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index 9166b6593ff..59d01ee37c2 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -210,7 +210,7 @@ static int tpm2_cache_capabilities(Tpm2Context *c) { * by the SetAlgorithmSet() command. Unfortunately, the spec doesn't require a TPM reinitialization * after changing the algorithm set (unless the PCR algorithms are changed). However, the spec also * indicates the TPM behavior after SetAlgorithmSet() is "vendor-dependent", giving the example of - * flushing sessions and objects, erasing policies, etc. So, if the algorithm set is programatically + * flushing sessions and objects, erasing policies, etc. So, if the algorithm set is programmatically * changed while we are performing some operation, it's reasonable to assume it will break us even if * we don't cache the algorithms, thus they should be "safe" to cache. */ TPM2_ALG_ID current_alg = TPM2_ALG_FIRST; @@ -245,7 +245,7 @@ static int tpm2_cache_capabilities(Tpm2Context *c) { } /* Cache the command capabilities. The spec isn't actually clear if commands can be added/removed - * while running, but that would be crazy, so let's hope it is not possbile. */ + * while running, but that would be crazy, so let's hope it is not possible. */ TPM2_CC current_cc = TPM2_CC_FIRST; for (;;) { r = tpm2_get_capability( diff --git a/test/units/testsuite-04.journal.sh b/test/units/testsuite-04.journal.sh index 13901cb5885..c733ff332c2 100755 --- a/test/units/testsuite-04.journal.sh +++ b/test/units/testsuite-04.journal.sh @@ -141,7 +141,7 @@ journalctl --cursor "t=0;t=-1;t=0;t=0x0" | grep . >/dev/null journalctl --header | grep system.journal journalctl --field _EXE | grep . >/dev/null journalctl --no-hostname --utc --catalog | grep . >/dev/null -# Excercise executable_is_script() and the related code, e.g. `journalctl -b /path/to/a/script.sh` should turn +# Exercise executable_is_script() and the related code, e.g. `journalctl -b /path/to/a/script.sh` should turn # into ((_EXE=/bin/bash AND _COMM=script.sh) AND _BOOT_ID=c002e3683ba14fa8b6c1e12878386514) journalctl -b "$(readlink -f "$0")" | grep . >/dev/null journalctl -b "$(systemd-id128 boot-id)" | grep . >/dev/null -- 2.39.2