diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
| commit | 686494f0f71b9235399b8241aba3e0c2fcb03ea1 (patch) | |
| tree | 39256173e40ef50d45cc35c22561da9279f9753b /src/lib/net | |
| parent | edc0bf5089df13d1d6a246e67bddb484ac99ad59 (diff) | |
| parent | b5ccdd978ea138cde92b3513c9d653ba18b8b463 (diff) | |
| download | tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.tar.gz tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.zip | |
Merge branch 'clang_format_prep_3'
Diffstat (limited to 'src/lib/net')
| -rw-r--r-- | src/lib/net/address.c | 2 | ||||
| -rw-r--r-- | src/lib/net/resolve.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/net/address.c b/src/lib/net/address.c index ac4350b8fe..e968d8a7f7 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -97,7 +97,7 @@ * work correctly. Bail out here if we've found a platform where AF_UNSPEC * isn't 0. */ #if AF_UNSPEC != 0 -#error We rely on AF_UNSPEC being 0. Let us know about your platform, please! +#error "We rely on AF_UNSPEC being 0. Yours isn't. Please tell us more!" #endif CTASSERT(AF_UNSPEC == 0); diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c index df079d5db3..68a8c01ef4 100644 --- a/src/lib/net/resolve.c +++ b/src/lib/net/resolve.c @@ -372,11 +372,11 @@ static HT_HEAD(getaddrinfo_cache, cached_getaddrinfo_item_t) HT_PROTOTYPE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, cached_getaddrinfo_item_hash, - cached_getaddrinfo_items_eq) + cached_getaddrinfo_items_eq); HT_GENERATE2(getaddrinfo_cache, cached_getaddrinfo_item_t, node, cached_getaddrinfo_item_hash, cached_getaddrinfo_items_eq, - 0.6, tor_reallocarray_, tor_free_) + 0.6, tor_reallocarray_, tor_free_); /** If true, don't try to cache getaddrinfo results. */ static int sandbox_getaddrinfo_cache_disabled = 0; |