summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-03-16 11:44:36 +0000
committertb <>2022-03-16 11:44:36 +0000
commitc2cafb33b061f401a2bcf97fd096769d7786ee65 (patch)
treec7de84a0d186606523b67feaa2d7d9109d6d8746
parent1b0429300cb517f65614cbebf1023e342f8715f5 (diff)
downloadopenbsd-c2cafb33b061f401a2bcf97fd096769d7786ee65.tar.gz
openbsd-c2cafb33b061f401a2bcf97fd096769d7786ee65.tar.bz2
openbsd-c2cafb33b061f401a2bcf97fd096769d7786ee65.zip
Make gcc 4 happier about x509_addr.c
gcc 4 on sparc64 issues a few 'warning: value computed is not used'. There are two cases: sk_set_cmp_function() returns the old comparison function of the stack which we don't care about. The one warning about an sk_delete() is about a return value that we know already and which we will free a few lines down. ok inoguchi miod
-rw-r--r--src/lib/libcrypto/x509/x509_addr.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index 209c5cf397..035353826b 100644
--- a/src/lib/libcrypto/x509/x509_addr.c
+++ b/src/lib/libcrypto/x509/x509_addr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_addr.c,v 1.77 2022/02/04 16:34:15 tb Exp $ */ 1/* $OpenBSD: x509_addr.c,v 1.78 2022/03/16 11:44:36 tb Exp $ */
2/* 2/*
3 * Contributed to the OpenSSL Project by the American Registry for 3 * Contributed to the OpenSSL Project by the American Registry for
4 * Internet Numbers ("ARIN"). 4 * Internet Numbers ("ARIN").
@@ -485,7 +485,7 @@ IPAddressFamily_find_in_parent(IPAddrBlocks *parent, IPAddressFamily *child_af)
485{ 485{
486 int index; 486 int index;
487 487
488 sk_IPAddressFamily_set_cmp_func(parent, IPAddressFamily_cmp); 488 (void)sk_IPAddressFamily_set_cmp_func(parent, IPAddressFamily_cmp);
489 489
490 if ((index = sk_IPAddressFamily_find(parent, child_af)) < 0) 490 if ((index = sk_IPAddressFamily_find(parent, child_af)) < 0)
491 return NULL; 491 return NULL;
@@ -1049,10 +1049,12 @@ make_prefix_or_range(IPAddrBlocks *addr, const unsigned afi,
1049 1049
1050 switch (afi) { 1050 switch (afi) {
1051 case IANA_AFI_IPV4: 1051 case IANA_AFI_IPV4:
1052 sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp); 1052 (void)sk_IPAddressOrRange_set_cmp_func(aors,
1053 v4IPAddressOrRange_cmp);
1053 break; 1054 break;
1054 case IANA_AFI_IPV6: 1055 case IANA_AFI_IPV6:
1055 sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp); 1056 (void)sk_IPAddressOrRange_set_cmp_func(aors,
1057 v6IPAddressOrRange_cmp);
1056 break; 1058 break;
1057 } 1059 }
1058 1060
@@ -1349,7 +1351,7 @@ IPAddressOrRanges_canonize(IPAddressOrRanges *aors, const unsigned afi)
1349 if (!make_addressRange(&merged, a_min, b_max, afi, length)) 1351 if (!make_addressRange(&merged, a_min, b_max, afi, length))
1350 return 0; 1352 return 0;
1351 sk_IPAddressOrRange_set(aors, i, merged); 1353 sk_IPAddressOrRange_set(aors, i, merged);
1352 sk_IPAddressOrRange_delete(aors, i + 1); 1354 (void)sk_IPAddressOrRange_delete(aors, i + 1);
1353 IPAddressOrRange_free(a); 1355 IPAddressOrRange_free(a);
1354 IPAddressOrRange_free(b); 1356 IPAddressOrRange_free(b);
1355 i--; 1357 i--;
@@ -1394,7 +1396,7 @@ X509v3_addr_canonize(IPAddrBlocks *addr)
1394 return 0; 1396 return 0;
1395 } 1397 }
1396 1398
1397 sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp); 1399 (void)sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
1398 sk_IPAddressFamily_sort(addr); 1400 sk_IPAddressFamily_sort(addr);
1399 1401
1400 return X509v3_addr_is_canonical(addr); 1402 return X509v3_addr_is_canonical(addr);