yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 00:15:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify conditional guards in error.c

Browse Source 
Simplify the guards on MBEDTLS_ERROR_C and MBEDTLS_ERROR_STRERROR_DUMMY.

No longer include superfluous headers and definition: string.h and
platform.h are only needed for MBEDTLS_ERROR_C; time_t is not needed
at all.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2020-11-09 15:14:10 +01:00
parent 2d847a5e07
commit 4159c7154c
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/error.c
View File

@ -51,20 +51,19 @@
#endif #endif
#if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY) #if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
#include "mbedtls/error.h" #include "mbedtls/error.h"
#include <string.h>
#endif #if defined(MBEDTLS_ERROR_C)
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#else #else
#define mbedtls_snprintf snprintf #define mbedtls_snprintf snprintf
#define mbedtls_time_t time_t
#endif #endif
#if defined(MBEDTLS_ERROR_C)
#include <stdio.h> #include <stdio.h>
#include <string.h>
#if defined(MBEDTLS_AES_C) #if defined(MBEDTLS_AES_C)
#include "mbedtls/aes.h" #include "mbedtls/aes.h"
@ -835,8 +834,6 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
#else /* MBEDTLS_ERROR_C */ #else /* MBEDTLS_ERROR_C */
#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
/* /*
* Provide an non-function in case MBEDTLS_ERROR_C is not defined * Provide an non-function in case MBEDTLS_ERROR_C is not defined
*/ */
@ -848,6 +845,6 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
buf[0] = '\0'; buf[0] = '\0';
} }
#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
#endif /* MBEDTLS_ERROR_C */ #endif /* MBEDTLS_ERROR_C */
#endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */

15
scripts/data_files/error.fmt
View File

@ -51,20 +51,19 @@
#endif #endif
#if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY) #if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
#include "mbedtls/error.h" #include "mbedtls/error.h"
#include <string.h>
#endif #if defined(MBEDTLS_ERROR_C)
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#else #else
#define mbedtls_snprintf snprintf #define mbedtls_snprintf snprintf
#define mbedtls_time_t time_t
#endif #endif
#if defined(MBEDTLS_ERROR_C)
#include <stdio.h> #include <stdio.h>
#include <string.h>
HEADER_INCLUDED HEADER_INCLUDED
@ -130,8 +129,6 @@ LOW_LEVEL_CODE_CHECKS
#else /* MBEDTLS_ERROR_C */ #else /* MBEDTLS_ERROR_C */
#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
/* /*
* Provide an non-function in case MBEDTLS_ERROR_C is not defined * Provide an non-function in case MBEDTLS_ERROR_C is not defined
*/ */
@ -143,6 +140,6 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
buf[0] = '\0'; buf[0] = '\0';
} }
#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
#endif /* MBEDTLS_ERROR_C */ #endif /* MBEDTLS_ERROR_C */
#endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */