wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix warnings

Browse source
This commit is contained in:
Dr. Stephen Henson 2012-01-04 14:45:09 +00:00
parent 22d89c501e
commit 9eab925395
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crypto/x509v3/v3_addr.c
View file

@ -602,10 +602,10 @@ static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
return NULL; return NULL;
switch (afi) { switch (afi) {
case IANA_AFI_IPV4: case IANA_AFI_IPV4:
sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp); (void) sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);
break; break;
case IANA_AFI_IPV6: case IANA_AFI_IPV6:
sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp); (void) sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);
break; break;
} }
f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges; f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges;
@ -870,8 +870,8 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
IPAddressOrRange *merged; IPAddressOrRange *merged;
if (!make_addressRange(&merged, a_min, b_max, length)) if (!make_addressRange(&merged, a_min, b_max, length))
return 0; return 0;
sk_IPAddressOrRange_set(aors, i, merged); (void) sk_IPAddressOrRange_set(aors, i, merged);
sk_IPAddressOrRange_delete(aors, i + 1); (void) sk_IPAddressOrRange_delete(aors, i + 1);
IPAddressOrRange_free(a); IPAddressOrRange_free(a);
IPAddressOrRange_free(b); IPAddressOrRange_free(b);
--i; --i;
@ -909,7 +909,7 @@ int v3_addr_canonize(IPAddrBlocks *addr)
v3_addr_get_afi(f))) v3_addr_get_afi(f)))
return 0; return 0;
} }
sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp); (void) sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
sk_IPAddressFamily_sort(addr); sk_IPAddressFamily_sort(addr);
OPENSSL_assert(v3_addr_is_canonical(addr)); OPENSSL_assert(v3_addr_is_canonical(addr));
return 1; return 1;
@ -1159,7 +1159,7 @@ int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
return 1; return 1;
if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b)) if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b))
return 0; return 0;
sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp); (void) sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);
for (i = 0; i < sk_IPAddressFamily_num(a); i++) { for (i = 0; i < sk_IPAddressFamily_num(a); i++) {
IPAddressFamily *fa = sk_IPAddressFamily_value(a, i); IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);
int j = sk_IPAddressFamily_find(b, fa); int j = sk_IPAddressFamily_find(b, fa);
@ -1224,7 +1224,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
} }
if (!v3_addr_is_canonical(ext)) if (!v3_addr_is_canonical(ext))
validation_err(X509_V_ERR_INVALID_EXTENSION); validation_err(X509_V_ERR_INVALID_EXTENSION);
sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp); (void) sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);
if ((child = sk_IPAddressFamily_dup(ext)) == NULL) { if ((child = sk_IPAddressFamily_dup(ext)) == NULL) {
X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE); X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE);
ret = 0; ret = 0;
@ -1250,7 +1250,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
} }
continue; continue;
} }
sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp); (void) sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);
for (j = 0; j < sk_IPAddressFamily_num(child); j++) { for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
IPAddressFamily *fc = sk_IPAddressFamily_value(child, j); IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc); int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);