mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-03-20 19:21:09 +01:00
Merge branch 'development' into development
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
@@ -99,41 +99,41 @@
|
||||
|
||||
#if defined(MBEDTLS_MPS_STATE_VALIDATION)
|
||||
|
||||
#define MBEDTLS_MPS_STATE_VALIDATE_RAW( cond, string ) \
|
||||
#define MBEDTLS_MPS_STATE_VALIDATE_RAW(cond, string) \
|
||||
do \
|
||||
{ \
|
||||
if( !(cond) ) \
|
||||
if (!(cond)) \
|
||||
{ \
|
||||
MBEDTLS_MPS_TRACE( MBEDTLS_MPS_TRACE_TYPE_ERROR, string ); \
|
||||
MBEDTLS_MPS_TRACE_RETURN( MBEDTLS_ERR_MPS_OPERATION_UNEXPECTED ); \
|
||||
MBEDTLS_MPS_TRACE(MBEDTLS_MPS_TRACE_TYPE_ERROR, string); \
|
||||
MBEDTLS_MPS_TRACE_RETURN(MBEDTLS_ERR_MPS_OPERATION_UNEXPECTED); \
|
||||
} \
|
||||
} while( 0 )
|
||||
} while (0)
|
||||
|
||||
#else /* MBEDTLS_MPS_STATE_VALIDATION */
|
||||
|
||||
#define MBEDTLS_MPS_STATE_VALIDATE_RAW( cond, string ) \
|
||||
#define MBEDTLS_MPS_STATE_VALIDATE_RAW(cond, string) \
|
||||
do \
|
||||
{ \
|
||||
( cond ); \
|
||||
} while( 0 )
|
||||
(cond); \
|
||||
} while (0)
|
||||
|
||||
#endif /* MBEDTLS_MPS_STATE_VALIDATION */
|
||||
|
||||
#if defined(MBEDTLS_MPS_ENABLE_ASSERTIONS)
|
||||
|
||||
#define MBEDTLS_MPS_ASSERT_RAW( cond, string ) \
|
||||
#define MBEDTLS_MPS_ASSERT_RAW(cond, string) \
|
||||
do \
|
||||
{ \
|
||||
if( !(cond) ) \
|
||||
if (!(cond)) \
|
||||
{ \
|
||||
MBEDTLS_MPS_TRACE( MBEDTLS_MPS_TRACE_TYPE_ERROR, string ); \
|
||||
MBEDTLS_MPS_TRACE_RETURN( MBEDTLS_ERR_MPS_INTERNAL_ERROR ); \
|
||||
MBEDTLS_MPS_TRACE(MBEDTLS_MPS_TRACE_TYPE_ERROR, string); \
|
||||
MBEDTLS_MPS_TRACE_RETURN(MBEDTLS_ERR_MPS_INTERNAL_ERROR); \
|
||||
} \
|
||||
} while( 0 )
|
||||
} while (0)
|
||||
|
||||
#else /* MBEDTLS_MPS_ENABLE_ASSERTIONS */
|
||||
|
||||
#define MBEDTLS_MPS_ASSERT_RAW( cond, string ) do {} while( 0 )
|
||||
#define MBEDTLS_MPS_ASSERT_RAW(cond, string) do {} while (0)
|
||||
|
||||
#endif /* MBEDTLS_MPS_ENABLE_ASSERTIONS */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user