mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Note: this doesn't actually fix #43090.
This commit is contained in:
Mukund Sivaraman 2016-08-29 18:52:49 +05:30
parent 5336feefb0
commit becac651e8
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,5 +1,8 @@
--- 9.11.0rc1 released --- --- 9.11.0rc1 released ---
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. 4457. [maint] Added AAAA (2001:500:a8::e) for E.ROOT-SERVERS.NET.
4456. [doc] Add DOCTYPE and lang attribute to <html> tags. 4456. [doc] Add DOCTYPE and lang attribute to <html> tags.

16
lib/dns/name.c
View File

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

4
lib/isc/hash.c
View File

@ -439,7 +439,7 @@ isc_hash_function(const void *data, size_t length,
const unsigned char *bp; const unsigned char *bp;
const unsigned char *be; 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); RUNTIME_CHECK(isc_once_do(&fnv_once, fnv_initialize) == ISC_R_SUCCESS);
hval = ISC_UNLIKELY(previous_hashp != NULL) ? hval = ISC_UNLIKELY(previous_hashp != NULL) ?
@ -506,7 +506,7 @@ isc_hash_function_reverse(const void *data, size_t length,
const unsigned char *bp; const unsigned char *bp;
const unsigned char *be; 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); RUNTIME_CHECK(isc_once_do(&fnv_once, fnv_initialize) == ISC_R_SUCCESS);
hval = ISC_UNLIKELY(previous_hashp != NULL) ? hval = ISC_UNLIKELY(previous_hashp != NULL) ?