Spelling fixes

Found by codespell.

diff --git a/NEWS b/NEWS
index ffd6be297bf96cfa4cce388a2da094c9e847c0d8..0880d1e4192cb8d7cc9b21161809ae8f93585fb0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -207,7 +207,7 @@ Thanks to Martin Schobert for auditing tinc and reporting the vulnerability.
 
 # Version 1.1pre6              February 20 2013
 
-* Fixed tincd exitting immediately on Windows.
+* Fixed tincd exiting immediately on Windows.
 * Detect PMTU increases.
 * Fixed crashes when using a SOCKS5 proxy.
 * Fixed control connection when using a proxy.

diff --git a/doc/PROTOCOL b/doc/PROTOCOL
index 3ac958497f3aef9551f0f99c97e537f9464d5ae8..4d353f80f115223c974285971c14fc20ffc01cfa 100644 (file)
--- a/doc/PROTOCOL
+++ b/doc/PROTOCOL
@@ -128,7 +128,7 @@ chances are that not every tinc daemon will ever send a packet to every
 other daemon. Instead, if a daemon needs a key it sends a request for it
 via the meta connection of the nearest hop in the direction of the
 destination. If any hop on the way has already learned the key, it will
-act as a proxy and forward its copy back to the requestor.
+act as a proxy and forward its copy back to the requester.
 
 daemon message
 --------------------------------------------------------------------------

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 7fe8e503d3095e392a7e722ac56ec8e5a724fa13..cdb21c8eb27604ec4a57cd331be9a3370d2413cd 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -312,7 +312,7 @@ To use the utun driver, add @samp{Device = utunX} to @file{tinc.conf},
 where X is the desired number for the utun interface.
 You can also omit the number, in which case the first free number will be chosen.
 
-On OS X version 14 and above tinc supports the build-in "vmnet" driver.
+On OS X version 14 and above tinc supports the built-in "vmnet" driver.
 Use this driver if you need to run Tinc in "switch" mode on more recent Macs.
 To use the vmnet driver add @samp{DeviceType = vmnet} to @file{tinc.conf}.
 "vmnet" devices have a fixed network configuration and cannot be configured with the

diff --git a/src/bsd/darwin/tunemu.c b/src/bsd/darwin/tunemu.c
index 4e3fbc7dde6f40c752b206714e49e8230a3d0655..8ab3598f552a14b0817677629ca203a8cdb0ff86 100644 (file)
--- a/src/bsd/darwin/tunemu.c
+++ b/src/bsd/darwin/tunemu.c
@@ -155,7 +155,7 @@ static int ppp_new_instance() {
                }
        }
 
-       // connect to ppp procotol
+       // connect to ppp protocol
        struct sockaddr_ppp pppaddr;
        pppaddr.ppp_len = sizeof(struct sockaddr_ppp);
        pppaddr.ppp_family = AF_PPP;

diff --git a/src/hash.h b/src/hash.h
index 531c6639827a512f639f94fb918c56326cdbf5f3..3c0baee5bd725098f26376cefa915e61192ec247 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -50,7 +50,7 @@ uint32_t modulo(uint32_t hash, size_t n);
                        } \
                        if(++i == n) i = 0; \
                } \
-               /* We always pick the last slot. It's unfair. But thats life */ \
+               /* We always pick the last slot. */ \
                memcpy(&hash->keys[i], key, sizeof(t)); \
                hash->values[i] = value; \
        } \

diff --git a/src/netutl.c b/src/netutl.c
index 6654f977a783a1349282e7ce862afb3eac404a6b..1dca15bc516827404cd03c52353ea4f9c6823a55 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -199,7 +199,7 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
                return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
 
        default:
-               logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+               logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exiting!",
                       a->sa.sa_family);
                abort();
        }
@@ -246,7 +246,7 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
                return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
 
        default:
-               logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+               logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exiting!",
                       a->sa.sa_family);
                abort();
        }

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index e9271c12fe8a53a50ca751a0ab319baaaec75d2e..3147dc7cf85f5bc5979aeee62ed0448d1ea80b21 100644 (file)
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -200,7 +200,7 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
                return subnet_compare_ipv6(a, b);
 
        default:
-               logger(DEBUG_ALWAYS, LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!", a->type);
+               logger(DEBUG_ALWAYS, LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exiting!", a->type);
                exit(1);
        }
 

diff --git a/test/unit/test_fs.c b/test/unit/test_fs.c
index 579efa3fd0b17a296eac08d850ff9e13f43b3a2e..b335174ad8e7adf42158e71ef88e61811f7d44d9 100644 (file)
--- a/test/unit/test_fs.c
+++ b/test/unit/test_fs.c
@@ -77,18 +77,18 @@ static void test_makedir(unsigned int dir, bool exists) {
        char path[PATH_MAX];
        char container[PATH_MAX] = {0};
 
-       if (dir == DIR_CONFDIR) {
+       if(dir == DIR_CONFDIR) {
                strcpy(path, tmp);
-       } else if (dir == DIR_CONFBASE) {
+       } else if(dir == DIR_CONFBASE) {
                sprintf(path, "%s/conf", tmp);
                strcpy(container, tmp);
-       } else if (dir == DIR_CACHE) {
+       } else if(dir == DIR_CACHE) {
                sprintf(path, "%s/conf/cache", tmp);
                sprintf(container, "%s/conf", tmp);
-       } else if (dir == DIR_HOSTS) {
+       } else if(dir == DIR_HOSTS) {
                sprintf(path, "%s/conf/hosts", tmp);
                sprintf(container, "%s/conf", tmp);
-       } else if (dir == DIR_INVITATIONS) {
+       } else if(dir == DIR_INVITATIONS) {
                sprintf(path, "%s/conf/invitations", tmp);
                sprintf(container, "%s/conf", tmp);
        } else {