diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-08-23 19:57:00 +0200 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-08-25 13:03:54 +0200 |
| commit | d848520afed1d3a4e4c38307d3bf21e14bff096f (patch) | |
| tree | 8070dd63c4d643dc1a31bef0776f63f85dc2200e | |
| parent | quic_tls.c: Fix wrong format string when raising error (diff) | |
| download | openssl-d848520afed1d3a4e4c38307d3bf21e14bff096f.tar.xz openssl-d848520afed1d3a4e4c38307d3bf21e14bff096f.zip | |
ch_init(): Add braces to appease older clang compilers
They produce a warning `suggest braces around initialization of subobject`
otherwise.
Add -Wno-missing-braces to silence old clang compilers
And drop unnecessary braces in zeroing initializers.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21823)
| -rwxr-xr-x | Configure | 1 | ||||
| -rw-r--r-- | ssl/quic/quic_ackm.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -188,6 +188,7 @@ my @clang_devteam_warn = qw( -Wno-parentheses-equality -Wno-language-extension-token -Wno-extended-offsetof + -Wno-missing-braces -Wconditional-uninitialized -Wincompatible-pointer-types-discards-qualifiers -Wmissing-variable-declarations diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c index 7c567eae77..aa035da912 100644 --- a/ssl/quic/quic_ackm.c +++ b/ssl/quic/quic_ackm.c @@ -937,7 +937,7 @@ static void ackm_on_pkts_lost(OSSL_ACKM *ackm, int pkt_space, const OSSL_ACKM_TX_PKT *p, *pnext; OSSL_RTT_INFO rtt; QUIC_PN largest_pn_lost = 0; - OSSL_CC_LOSS_INFO loss_info = {{0}}; + OSSL_CC_LOSS_INFO loss_info = {0}; uint32_t flags = 0; for (p = lpkt; p != NULL; p = pnext) { @@ -984,7 +984,7 @@ static void ackm_on_pkts_acked(OSSL_ACKM *ackm, const OSSL_ACKM_TX_PKT *apkt) { const OSSL_ACKM_TX_PKT *anext; QUIC_PN last_pn_acked = 0; - OSSL_CC_ACK_INFO ainfo = {{0}}; + OSSL_CC_ACK_INFO ainfo = {0}; for (; apkt != NULL; apkt = anext) { if (apkt->is_inflight) { |