From d51c4fca291c6b8e566df65b0fd6e6262c3bf988 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 13 Nov 2020 16:19:49 +0900 Subject: [PATCH] tree-wide: fix "a the" or "the a" --- TODO | 2 +- man/sd_bus_process.xml | 2 +- src/basic/cgroup-util.c | 5 ++--- src/basic/fs-util.c | 2 +- src/resolve/resolved-dns-dnssec.c | 2 +- src/resolve/resolved-dns-transaction.c | 2 +- src/shared/conf-parser.h | 2 +- src/shared/user-record.c | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/TODO b/TODO index 89303f1220..b384d8ce9c 100644 --- a/TODO +++ b/TODO @@ -634,7 +634,7 @@ Features: parameters * maybe hook of xfs/ext4 quotactl() with services? i.e. automatically manage - the quota of a the user indicated in User= via unit file settings, like the + the quota of the user indicated in User= via unit file settings, like the other resource management concepts. Would mix nicely with DynamicUser=1. Or alternatively, do this with projids, so that we can also cover services running as root. Quota should probably cover all the special dirs such as diff --git a/man/sd_bus_process.xml b/man/sd_bus_process.xml index c5a9e0cfde..09b3c50dde 100644 --- a/man/sd_bus_process.xml +++ b/man/sd_bus_process.xml @@ -59,7 +59,7 @@ message is no longer needed. If ret is not NULL, progress was made, but no message was processed, *ret is set to NULL. - If a the bus object is connected to an + If the bus object is connected to an sd-event3 event loop (with sd_bus_attach_event3), it is not necessary to call sd_bus_process() directly as it is invoked automatically when diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 98329a954d..f28bf1866a 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -1875,9 +1875,8 @@ int cg_mask_supported(CGroupMask *ret) { if (r > 0) { _cleanup_free_ char *root = NULL, *controllers = NULL, *path = NULL; - /* In the unified hierarchy we can read the supported - * and accessible controllers from a the top-level - * cgroup attribute */ + /* In the unified hierarchy we can read the supported and accessible controllers from + * the top-level cgroup attribute */ r = cg_get_root_path(&root); if (r < 0) diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index fdd99467c7..6924f5dfb1 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -810,7 +810,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, * * 3. With CHASE_STEP: in this case only a single step of the normalization is executed, i.e. only the first * symlink or ".." component of the path is resolved, and the resulting path is returned. This is useful if - * a caller wants to trace the a path through the file system verbosely. Returns < 0 on error, > 0 if the + * a caller wants to trace the path through the file system verbosely. Returns < 0 on error, > 0 if the * path is fully normalized, and == 0 for each normalization step. This may be combined with * CHASE_NONEXISTENT, in which case 1 is returned when a component is not found. * diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c index 97bbbe4282..2f5776b5ed 100644 --- a/src/resolve/resolved-dns-dnssec.c +++ b/src/resolve/resolved-dns-dnssec.c @@ -1380,7 +1380,7 @@ static int nsec3_hashed_domain_make(DnsResourceRecord *nsec3, const char *domain * matches the wildcard domain. * * Based on this we can prove either the existence of the record in @key, or NXDOMAIN or NODATA, or - * that there is no proof either way. The latter is the case if a the proof of non-existence of a given + * that there is no proof either way. The latter is the case if a proof of non-existence of a given * name uses an NSEC3 record with the opt-out bit set. Lastly, if we are given insufficient NSEC3 records * to conclude anything we indicate this by returning NO_RR. */ static int dnssec_test_nsec3(DnsAnswer *answer, DnsResourceKey *key, DnssecNsecResult *result, bool *authenticated, uint32_t *ttl) { diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index 2da957e78c..1b8bead7c3 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -2117,7 +2117,7 @@ int dns_transaction_request_dnssec_keys(DnsTransaction *t) { return r; if (r == 0) { /* Hmm, so this SOA RR doesn't match our original question. In this case, maybe this is - * a negative reply, and we need the a SOA RR's TTL in order to cache a negative entry? + * a negative reply, and we need the SOA RR's TTL in order to cache a negative entry? * If so, we need to validate it, too. */ r = dns_answer_match_key(t->answer, t->key, NULL); diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index 8f8714361d..f115cb23af 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -35,7 +35,7 @@ typedef enum ConfigParseFlags { /* Prototype for a parser for a specific configuration setting */ typedef int (*ConfigParserCallback)(CONFIG_PARSER_ARGUMENTS); -/* A macro declaring the a function prototype, following the typedef above, simply because it's so cumbersomely long +/* A macro declaring a function prototype, following the typedef above, simply because it's so cumbersomely long * otherwise. (And current emacs gets irritatingly slow when editing files that contain lots of very long function * prototypes on the same screen…) */ #define CONFIG_PARSER_PROTOTYPE(name) int name(CONFIG_PARSER_ARGUMENTS) diff --git a/src/shared/user-record.c b/src/shared/user-record.c index afa3986642..6c48c56a2a 100644 --- a/src/shared/user-record.c +++ b/src/shared/user-record.c @@ -2062,7 +2062,7 @@ bool user_record_compatible(UserRecord *a, UserRecord *b) { assert(a); assert(b); - /* If either lacks a the regular section, we can't really decide, let's hence say they are + /* If either lacks the regular section, we can't really decide, let's hence say they are * incompatible. */ if (!(a->mask & b->mask & USER_RECORD_REGULAR)) return false;