diff --git a/CHANGES b/CHANGES index f213dde3fa..5b8c14cd27 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + 80. [cleanup] does not need or . + 79. [cleanup] does not need . 78. [cleanup] lwres_conftest renamed to lwresconf_test for diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index ac7b6cffbf..d4bc04b097 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -54,7 +55,8 @@ ttlfmt(unsigned int t, char *s, isc_boolean_t verbose, t, s, t == 1 ? "" : "s"); else - len = snprintf(tmp, sizeof(tmp), "%u%c", t, s[0]); + len = snprintf(tmp, sizeof(tmp), "%u%c", t, s[0]); + INSIST(len + 1 <= sizeof tmp); isc_buffer_available(target, ®ion); if (len > region.length) @@ -67,9 +69,7 @@ ttlfmt(unsigned int t, char *s, isc_boolean_t verbose, /* Derived from bind8 ns_format_ttl(). */ isc_result_t -dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, - isc_buffer_t *target) -{ +dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, isc_buffer_t *target) { unsigned secs, mins, hours, days, weeks, x; secs = src % 60; src /= 60; diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h index 2233310222..718189def1 100644 --- a/lib/isc/include/isc/print.h +++ b/lib/isc/include/isc/print.h @@ -22,8 +22,6 @@ *** Imports ***/ -#include -#include #include #include