mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 23:55:27 +00:00
Code Issues Releases Wiki Activity

Reversing prior change, turns out not to be legal on all compilers.

Browse Source
This commit is contained in:
Evan Hunt
2011-03-11 01:28:10 +00:00
parent f2f2d20990
commit a7acfb05df
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dns/masterdump.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: masterdump.c,v 1.102 2011/03/11 01:20:39 each Exp $ */ /* $Id: masterdump.c,v 1.103 2011/03/11 01:28:10 each Exp $ */
/*! \file */ /*! \file */
@@ -1385,7 +1385,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
isc_buffer_region(&buffer, &r); isc_buffer_region(&buffer, &r);
isc_buffer_putuint32(&buffer, dns_masterformat_raw); isc_buffer_putuint32(&buffer, dns_masterformat_raw);
isc_buffer_putuint32(&buffer, DNS_RAWFORMAT_VERSION); isc_buffer_putuint32(&buffer, DNS_RAWFORMAT_VERSION);
#if (sizeof(isc_uint32_t) != sizeof(isc_stdtime_t)) if (sizeof(now32) != sizeof(dctx->now)) {
/* /*
* We assume isc_stdtime_t is a 32-bit integer, * We assume isc_stdtime_t is a 32-bit integer,
* which should be the case on most cases. * which should be the case on most cases.
@@ -1400,9 +1400,8 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
"dumping master file in raw " "dumping master file in raw "
"format: stdtime is not 32bits"); "format: stdtime is not 32bits");
now32 = 0; now32 = 0;
#else } else
now32 = dctx->now; now32 = dctx->now;
#endif
isc_buffer_putuint32(&buffer, now32); isc_buffer_putuint32(&buffer, now32);
INSIST(isc_buffer_usedlength(&buffer) <= INSIST(isc_buffer_usedlength(&buffer) <=
sizeof(rawheader)); sizeof(rawheader));