upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 18:59:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update assertions to be more correct, and also remove use of a reserved word (#43090)

Browse source 
Note: this doesn't actually fix #43090.
(cherry picked from commit becac651e8)
(cherry picked from commit ce78690029)
(cherry picked from commit 0edca7b6cd)
This commit is contained in:
Mukund Sivaraman 2016-08-29 18:52:49 +05:30
parent 7468edf680
commit 05f676f3e6
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,4 +1,7 @@
4458. [cleanup] Update assertions to be more correct, and also remove
use of a reserved word. [RT #43090]
4457. [maint] Added AAAA (2001:500:a8::e) for E.ROOT-SERVERS.NET.
4456. [doc] Add DOCTYPE and lang attribute to <html> tags.

16
lib/dns/name.c
View file

@ -114,17 +114,17 @@ static unsigned char maptolower[] = {
#define CONVERTTOASCII(c)
#define CONVERTFROMASCII(c)
#define INIT_OFFSETS(name, var, default) \
if (name->offsets != NULL) \
var = name->offsets; \
#define INIT_OFFSETS(name, var, default_offsets) \
if ((name)->offsets != NULL) \
var = (name)->offsets; \
else \
var = default;
var = (default_offsets);
#define SETUP_OFFSETS(name, var, default) \
if (name->offsets != NULL) \
var = name->offsets; \
#define SETUP_OFFSETS(name, var, default_offsets) \
if ((name)->offsets != NULL) \
var = (name)->offsets; \
else { \
var = default; \
var = (default_offsets); \
set_offsets(name, var, NULL); \
}

4
lib/isc/hash.c
View file

@ -424,7 +424,7 @@ isc_hash_function(const void *data, size_t length,
const unsigned char *bp;
const unsigned char *be;
INSIST(data == NULL || length > 0);
REQUIRE(length == 0 || data != NULL);
RUNTIME_CHECK(isc_once_do(&fnv_once, fnv_initialize) == ISC_R_SUCCESS);
hval = ISC_UNLIKELY(previous_hashp != NULL) ?
@ -491,7 +491,7 @@ isc_hash_function_reverse(const void *data, size_t length,
const unsigned char *bp;
const unsigned char *be;
INSIST(data == NULL || length > 0);
REQUIRE(length == 0 || data != NULL);
RUNTIME_CHECK(isc_once_do(&fnv_once, fnv_initialize) == ISC_R_SUCCESS);
hval = ISC_UNLIKELY(previous_hashp != NULL) ?