commit 5846c9de19ba4457107151cd7ec97825a4408ca1
author David Horstmann <david.horstmann@arm.com> Thu Oct 06 18:31:25 2022 +0100
committer David Horstmann <david.horstmann@arm.com> Tue Oct 25 16:43:05 2022 +0100
tree ac0b999111e8acdf4097d76d4e5de675900ee690
parent 0bb72434255db30660f9043015f4695648c7f14d

Refactor macro-spanning if in ssl_msg.c

Signed-off-by: David Horstmann <david.horstmann@arm.com>

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 7e27570..e8f47de 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -3944,8 +3944,8 @@
 
             if( ssl_record_is_in_progress( ssl ) == 0 )
             {
+                int dtls_have_buffered = 0;
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
-                int have_buffered = 0;
 
                 /* We only check for buffered messages if the
                  * current datagram is fully consumed. */
@@ -3953,11 +3953,11 @@
                     ssl_next_record_is_in_datagram( ssl ) == 0 )
                 {
                     if( ssl_load_buffered_message( ssl ) == 0 )
-                        have_buffered = 1;
+                        dtls_have_buffered = 1;
                 }
 
-                if( have_buffered == 0 )
 #endif /* MBEDTLS_SSL_PROTO_DTLS */
+                if( dtls_have_buffered == 0 )
                 {
                     ret = ssl_get_next_record( ssl );
                     if( ret == MBEDTLS_ERR_SSL_CONTINUE_PROCESSING )