Commit 956d1bda authored by Ondřej Surý's avatar Ondřej Surý
Browse files

isc_stdtime_t is always 32-bit now, so remove the always true macro STDTIME_ON_32BITS

(cherry picked from commit 6f5fe11f)
parent 15a4f74b
Pipeline #6328 passed with stages
in 9 minutes and 51 seconds
......@@ -1590,24 +1590,7 @@ writeheader(dns_dumpctx_t *dctx) {
r.base = (unsigned char *)&rawheader;
r.length = sizeof(rawheader);
isc_buffer_region(&buffer, &r);
#if !defined(STDTIME_ON_32BITS) || (STDTIME_ON_32BITS + 0) != 1
/*
* We assume isc_stdtime_t is a 32-bit integer,
* which should be the case on most platforms.
* If it turns out to be uncommon, we'll need
* to bump the version number and revise the
* header format.
*/
isc_log_write(dns_lctx,
ISC_LOGCATEGORY_GENERAL,
DNS_LOGMODULE_MASTERDUMP,
ISC_LOG_INFO,
"dumping master file in raw "
"format: stdtime is not 32bits");
now32 = 0;
#else
now32 = dctx->now;
#endif
rawversion = 1;
if ((dctx->header.flags & DNS_MASTERRAW_COMPAT) != 0)
rawversion = 0;
......
......@@ -6412,17 +6412,14 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
if (result == ISC_R_NOMORE)
result = ISC_R_SUCCESS;
if (timewarn > 0) {
#if defined(STDTIME_ON_32BITS)
isc_stdtime_t stdwarn = (isc_stdtime_t)timewarn;
if (timewarn == stdwarn)
#endif
if (timewarn == stdwarn) {
set_key_expiry_warning(zone, (isc_stdtime_t)timewarn,
now);
#if defined(STDTIME_ON_32BITS)
else
} else {
dns_zone_log(zone, ISC_LOG_ERROR,
"key expiry warning time out of range");
#endif
}
}
failure:
if (node != NULL)
......
......@@ -25,16 +25,6 @@
*/
typedef uint32_t isc_stdtime_t;
/* but this flag helps... */
#define STDTIME_ON_32BITS 1
/*
* isc_stdtime32_t is a 32-bit version of isc_stdtime_t. A variable of this
* type should only be used as an opaque integer (e.g.,) to compare two
* time values.
*/
typedef uint32_t isc_stdtime32_t;
ISC_LANG_BEGINDECLS
/* */
void
......
......@@ -23,16 +23,6 @@
*/
typedef uint32_t isc_stdtime_t;
/* but this flag helps... */
#define STDTIME_ON_32BITS 1
/*
* isc_stdtime32_t is a 32-bit version of isc_stdtime_t. A variable of this
* type should only be used as an opaque integer (e.g.,) to compare two
* time values.
*/
typedef uint32_t isc_stdtime32_t;
ISC_LANG_BEGINDECLS
void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment