Merge pull request #2705 from k-stachowiak/unified-exit-in-examples-2.7

Backport 2.7: Unify the example programs' termination
This commit is contained in:
Gilles Peskine 2020-05-12 10:47:04 +02:00 committed by GitHub
commit 087bb4c5b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 168 additions and 123 deletions

View file

@ -40,6 +40,7 @@
#define mbedtls_time time
#define mbedtls_time_t time_t
#define mbedtls_printf printf
#define mbedtls_exit exit
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
#endif /* MBEDTLS_PLATFORM_C */
@ -48,7 +49,7 @@
int main( void )
{
mbedtls_printf( "MBEDTLS_NET_C not defined.\n" );
return( 0 );
mbedtls_exit( 0 );
}
#else
@ -143,7 +144,7 @@ static void exit_usage( const char *name, const char *value )
mbedtls_printf( " option %s: illegal value: %s\n", name, value );
mbedtls_printf( USAGE );
exit( 1 );
mbedtls_exit( 1 );
}
static void get_options( int argc, char *argv[] )
@ -656,7 +657,7 @@ exit:
fflush( stdout ); getchar();
#endif
return( exit_code );
mbedtls_exit( exit_code );
}
#endif /* MBEDTLS_NET_C */