treewide: fix typos and then/that use

CODING_STYLE

@@ -163,7 +163,7 @@
   programming error with assert_return() and return a sensible return
   code. In all other calls, it is recommended to check for programming
   errors with a more brutal assert(). We are more forgiving to public
-  users then for ourselves! Note that assert() and assert_return()
+  users than for ourselves! Note that assert() and assert_return()
   really only should be used for detecting programming errors, not for
   runtime errors. assert() and assert_return() by usage of _likely_()
   inform the compiler that he should not expect these checks to fail,

NEWS

@@ -11,7 +11,7 @@ CHANGES WITH 230 in spe:
           interested in collecting feedback about the DNSSEC validator and its
           limitations in the wild. Note however, that DNSSEC support is
           probably nothing downstreams should turn on in stable distros just
-          yet, as it might create incompabilities with a few DNS servers and
+          yet, as it might create incompatibilities with a few DNS servers and
           networks. We tried hard to make sure we downgrade to non-DNSSEC mode
           automatically whenever we detect such incompatible setups, but there
           might be systems we do not cover yet. Hence: please help us testing

man/systemd.netdev.xml

@@ -361,7 +361,7 @@
 
     <para>The <literal>[MACVTAP]</literal> section applies for
     netdevs of kind <literal>macvtap</literal> and accepts the
-    same key as <literal>[MACVLAN].</literal> </para>
+    same key as <literal>[MACVLAN]</literal>.</para>
 
     </refsect1>
 

src/basic/socket-util.c

@@ -942,7 +942,7 @@ ssize_t next_datagram_size_fd(int fd) {
         int k;
 
         /* This is a bit like FIONREAD/SIOCINQ, however a bit more powerful. The difference being: recv(MSG_PEEK) will
-         * actually cause the next datagram in the queue to be validated regarding checksums, which FIONREAD dosn't
+         * actually cause the next datagram in the queue to be validated regarding checksums, which FIONREAD doesn't
          * do. This difference is actually of major importance as we need to be sure that the size returned here
          * actually matches what we will read with recvmsg() next, as otherwise we might end up allocating a buffer of
          * the wrong size. */

src/libsystemd/sd-daemon/sd-daemon.c

@@ -465,7 +465,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
         have_pid = pid != 0 && pid != getpid();
 
         if (n_fds > 0 || have_pid) {
-                /* CMSG_SPACE(0) may return value different then zero, which results in miscalculated controllen. */
+                /* CMSG_SPACE(0) may return value different than zero, which results in miscalculated controllen. */
                 msghdr.msg_controllen =
                         (n_fds > 0 ? CMSG_SPACE(sizeof(int) * n_fds) : 0) +
                         (have_pid ? CMSG_SPACE(sizeof(struct ucred)) : 0);

src/resolve/resolved-dns-answer.c

@@ -757,7 +757,7 @@ int dns_answer_reserve_or_clone(DnsAnswer **a, unsigned n_free) {
         assert(a);
 
         /* Tries to extend the DnsAnswer object. And if that's not
-         * possibly, since we are not the sole owner, then allocate a
+         * possible, since we are not the sole owner, then allocate a
          * new, appropriately sized one. Either way, after this call
          * the object will only have a single reference, and has room
          * for at least the specified number of RRs. */

src/resolve/resolved-dns-rr.h

@@ -82,7 +82,7 @@ enum {
 struct DnsResourceKey {
         unsigned n_ref; /* (unsigned -1) for const keys, see below */
         uint16_t class, type;
-        char *_name; /* don't access directy, use dns_resource_key_name()! */
+        char *_name; /* don't access directly, use dns_resource_key_name()! */
 };
 
 /* Creates a temporary resource key. This is only useful to quickly

src/shared/condition.c

@@ -295,7 +295,7 @@ static int condition_test_needs_update(Condition *c) {
                 return false;
 
         /* Any other failure means we should allow the condition to be true,
-         * so that we rather invoke too many update tools then too
+         * so that we rather invoke too many update tools than too
          * few. */
 
         if (!path_is_absolute(c->parameter))

src/shared/gcrypt-util.c

@@ -32,7 +32,7 @@ void initialize_libgcrypt(bool secmem) {
         p = gcry_check_version("1.4.5");
         assert(p);
 
-        /* Turn off "secmem". Clients which whish to make use of this
+        /* Turn off "secmem". Clients which wish to make use of this
          * feature should initialize the library manually */
         if (!secmem)
                 gcry_control(GCRYCTL_DISABLE_SECMEM);