yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-10-18 14:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr_679' into development-proposed

Browse source
This commit is contained in:
Gilles Peskine 2018-03-13 00:13:29 +01:00
parent 13678d251f 6dc4a31988
commit f3ada4adb0
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -56,6 +56,8 @@ Changes
* MD functions deprecated in 2.7.0 are no longer inline, to provide * MD functions deprecated in 2.7.0 are no longer inline, to provide
a migration path for those depending on the library's ABI. a migration path for those depending on the library's ABI.
* Clarify the documentation of mbedtls_ssl_setup. * Clarify the documentation of mbedtls_ssl_setup.
* Use (void) when defining functions with no parameters. Contributed by
Joris Aerts. #678
= mbed TLS 2.7.0 branch released 2018-02-03 = mbed TLS 2.7.0 branch released 2018-02-03

12
library/memory_buffer_alloc.c
View file

@ -113,7 +113,7 @@ static void debug_header( memory_header *hdr )
#endif #endif
} }
static void debug_chain() static void debug_chain( void )
{ {
memory_header *cur = heap.first; memory_header *cur = heap.first;
@ -180,7 +180,7 @@ static int verify_header( memory_header *hdr )
return( 0 ); return( 0 );
} }
static int verify_chain() static int verify_chain( void )
{ {
memory_header *prv = heap.first, *cur; memory_header *prv = heap.first, *cur;
@ -504,13 +504,13 @@ void mbedtls_memory_buffer_set_verify( int verify )
heap.verify = verify; heap.verify = verify;
} }
int mbedtls_memory_buffer_alloc_verify() int mbedtls_memory_buffer_alloc_verify( void )
{ {
return verify_chain(); return verify_chain();
} }
#if defined(MBEDTLS_MEMORY_DEBUG) #if defined(MBEDTLS_MEMORY_DEBUG)
void mbedtls_memory_buffer_alloc_status() void mbedtls_memory_buffer_alloc_status( void )
{ {
mbedtls_fprintf( stderr, mbedtls_fprintf( stderr,
"Current use: %zu blocks / %zu bytes, max: %zu blocks / " "Current use: %zu blocks / %zu bytes, max: %zu blocks / "
@ -607,7 +607,7 @@ void mbedtls_memory_buffer_alloc_init( unsigned char *buf, size_t len )
heap.first_free = heap.first; heap.first_free = heap.first;
} }
void mbedtls_memory_buffer_alloc_free() void mbedtls_memory_buffer_alloc_free( void )
{ {
#if defined(MBEDTLS_THREADING_C) #if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_free( &heap.mutex ); mbedtls_mutex_free( &heap.mutex );
@ -627,7 +627,7 @@ static int check_pointer( void *p )
return( 0 ); return( 0 );
} }
static int check_all_free( ) static int check_all_free( void )
{ {
if( if(
#if defined(MBEDTLS_MEMORY_DEBUG) #if defined(MBEDTLS_MEMORY_DEBUG)

2
library/version.c
View file

@ -30,7 +30,7 @@
#include "mbedtls/version.h" #include "mbedtls/version.h"
#include <string.h> #include <string.h>
unsigned int mbedtls_version_get_number() unsigned int mbedtls_version_get_number( void )
{ {
return( MBEDTLS_VERSION_NUMBER ); return( MBEDTLS_VERSION_NUMBER );
} }