diff --git a/lib/dns/name.c b/lib/dns/name.c index d9d55eb4f1..f1939d27d1 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -853,12 +853,6 @@ dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) { REQUIRE(labels > 0); REQUIRE(dns_name_iswildcard(wname)); -#if defined(__clang__) && \ - (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 2)) - memset(&tname, 0, sizeof(tname)); -#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \ - * 3 \ - * && __clang_minor__ < 2)) */ DNS_NAME_INIT(&tname, NULL); dns_name_getlabelsequence(wname, 1, labels - 1, &tname); if (dns_name_fullcompare(name, &tname, &order, &nlabels) == @@ -1977,12 +1971,6 @@ dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, * has one. */ if (name->offsets == NULL) { -#if defined(__clang__) && \ - (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 2)) - memset(&clname, 0, sizeof(clname)); -#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \ - * 3 \ - * && __clang_minor__ < 2)) */ DNS_NAME_INIT(&clname, clo); dns_name_clone(name, &clname); name = &clname; @@ -2300,12 +2288,6 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) { REQUIRE(VALID_NAME(name)); REQUIRE(digest != NULL); -#if defined(__clang__) && \ - (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 2)) - memset(&downname, 0, sizeof(downname)); -#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \ - * 3 \ - * && __clang_minor__ < 2)) */ DNS_NAME_INIT(&downname, NULL); isc_buffer_init(&buffer, data, sizeof(data)); diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 5d1e612295..4daf3bdff0 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -1145,18 +1145,6 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, return (ret); } } -#if defined(__clang__) && (__clang_major__ < 3 || \ - (__clang_major__ == 3 && __clang_minor__ < 2) || \ - (__clang_major__ == 4 && __clang_minor__ < 2)) - /* false positive: http://llvm.org/bugs/show_bug.cgi?id=14461 */ - else - { - memset(&querytsig, 0, sizeof(querytsig)); - } -#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \ - * 3 \ - * && __clang_minor__ < 2) || (__clang_major__ == 4 && __clang_minor__ \ - * < 2)) */ /* * Do the key name and algorithm match that of the query?