ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Cleanup couple of set-but-unused errors from Coverity

Browse Source
This commit is contained in:
Ondřej Surý
2018-08-24 21:38:39 +02:00
committed by Stephen Morris
parent 55361748d7
commit de41f0beea
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dns/rdataset.c
View File

@@ -312,8 +312,7 @@ towire_compare(const void *av, const void *bv) {
static inline void
swap_rdata(dns_rdata_t *in, unsigned int a, unsigned int b) {
dns_rdata_t rdata = DNS_RDATA_INIT;
rdata = in[a];
dns_rdata_t rdata = in[a];
in[a] = in[b];
in[b] = rdata;
}
@@ -403,7 +402,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
if ((shuffle || sort)) {
uint32_t seed = 0;
unsigned int j;
unsigned int j = 0;
/*
* First we get handles to all of the rdata.
@@ -423,15 +422,12 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
if (ISC_LIKELY(want_random)) {
seed = isc_random32();
j = 0;
}
if (ISC_UNLIKELY(want_cyclic) &&
(rdataset->count != DNS_RDATASET_COUNT_UNDEFINED))
{
j = rdataset->count % count;
} else { /* Otherwise, just start from beginning */
j = 0;
}
for (i = 0; i < count; i++) {

7
lib/isc/pk11.c
View File

@@ -445,10 +445,11 @@ token_login(pk11_session_t *sp) {
(CK_UTF8CHAR_PTR) token->pin,
(CK_ULONG) strlen(token->pin));
if (rv != CKR_OK) {
ret = ISC_R_NOPERM;
#if PK11_NO_LOGERR
pk11_error_fatalcheck(__FILE__, __LINE__,
"pkcs_C_Login", rv);
#else
ret = ISC_R_NOPERM;
#endif
} else
token->logged = true;
@@ -766,14 +767,13 @@ pk11_attribute_bytype(const pk11_object_t *obj, CK_ATTRIBUTE_TYPE type) {
static char *
percent_decode(char *x, size_t *len) {
char *p, *c;
unsigned char v;
unsigned char v = 0;
INSIST(len != NULL);
for (p = c = x; p[0] != '\0'; p++, c++) {
switch (p[0]) {
case '%':
v = 0;
switch (p[1]) {
case '0':
case '1':
@@ -1112,7 +1112,6 @@ pk11_dump_tokens(void) {
if (token->operations & (1 << OP_ECDSA)) {
if (!first)
printf(",");
first = false;
printf("EC");
}
printf(")\n");