Apply clang formatting.
Executed with:
`find . -regextype posix-egrep -regex ".*\.([hc]|fmt|function)" | xargs -L1 clang-format-12 -i`
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
diff --git a/tests/suites/target_test.function b/tests/suites/target_test.function
index 3d0bc80..71bc260 100644
--- a/tests/suites/target_test.function
+++ b/tests/suites/target_test.function
@@ -11,17 +11,15 @@
* \param step Increment size
*
*/
-#define INCR_ASSERT(p, start, len, step) do \
-{ \
- TEST_HELPER_ASSERT( ( p ) >= ( start ) ); \
- TEST_HELPER_ASSERT( sizeof( *( p ) ) == sizeof( *( start ) ) ); \
- /* <= is checked to support use inside a loop where \
- pointer is incremented after reading data. */ \
- TEST_HELPER_ASSERT( (uint32_t)( ( ( p ) - ( start ) ) + ( step ) ) <= ( len ) );\
- ( p ) += ( step ); \
-} \
-while( 0 )
-
+#define INCR_ASSERT(p, start, len, step) \
+ do { \
+ TEST_HELPER_ASSERT((p) >= (start)); \
+ TEST_HELPER_ASSERT(sizeof(*(p)) == sizeof(*(start))); \
+ /* <= is checked to support use inside a loop where \
+ pointer is incremented after reading data. */ \
+ TEST_HELPER_ASSERT((uint32_t)(((p) - (start)) + (step)) <= (len)); \
+ (p) += (step); \
+ } while (0)
/**
* \brief 4 byte align unsigned char pointer
@@ -31,13 +29,11 @@
* \param len Length of byte array
*
*/
-#define ALIGN_32BIT(p, start, len) do \
-{ \
- uint32_t align = ( - (uintptr_t)( p ) ) % 4; \
- INCR_ASSERT( ( p ), ( start ), ( len ), align );\
-} \
-while( 0 )
-
+#define ALIGN_32BIT(p, start, len) \
+ do { \
+ uint32_t align = (-(uintptr_t)(p)) % 4; \
+ INCR_ASSERT((p), (start), (len), align); \
+ } while (0)
/**
* \brief Verify dependencies. Dependency identifiers are
@@ -48,15 +44,14 @@
*
* \return DEPENDENCY_SUPPORTED if success else DEPENDENCY_NOT_SUPPORTED.
*/
-int verify_dependencies( uint8_t count, uint8_t * dep_p )
+int verify_dependencies(uint8_t count, uint8_t *dep_p)
{
uint8_t i;
- for ( i = 0; i < count; i++ )
- {
- if ( dep_check( (int)(dep_p[i]) ) != DEPENDENCY_SUPPORTED )
- return DEPENDENCY_NOT_SUPPORTED ;
+ for (i = 0; i < count; i++) {
+ if (dep_check((int)(dep_p[i])) != DEPENDENCY_SUPPORTED)
+ return DEPENDENCY_NOT_SUPPORTED;
}
- return DEPENDENCY_SUPPORTED ;
+ return DEPENDENCY_SUPPORTED;
}
/**
@@ -76,11 +71,11 @@
c[1] = greentea_getc();
c[2] = '\0';
- TEST_HELPER_ASSERT( mbedtls_test_unhexify( &byte, sizeof( byte ),
- c, &len ) == 0 );
- TEST_HELPER_ASSERT( len != 2 );
+ TEST_HELPER_ASSERT(mbedtls_test_unhexify(&byte, sizeof(byte), c, &len) ==
+ 0);
+ TEST_HELPER_ASSERT(len != 2);
- return byte ;
+ return byte;
}
/**
@@ -95,23 +90,17 @@
{
uint32_t value;
size_t len;
- const uint8_t c_be[8] = { greentea_getc(),
- greentea_getc(),
- greentea_getc(),
- greentea_getc(),
- greentea_getc(),
- greentea_getc(),
- greentea_getc(),
- greentea_getc()
- };
+ const uint8_t c_be[8] = { greentea_getc(), greentea_getc(), greentea_getc(),
+ greentea_getc(), greentea_getc(), greentea_getc(),
+ greentea_getc(), greentea_getc() };
const uint8_t c[9] = { c_be[6], c_be[7], c_be[4], c_be[5], c_be[2],
c_be[3], c_be[0], c_be[1], '\0' };
- TEST_HELPER_ASSERT( mbedtls_test_unhexify( (uint8_t*)&value, sizeof( value ),
- c, &len ) == 0 );
- TEST_HELPER_ASSERT( len != 8 );
+ TEST_HELPER_ASSERT(
+ mbedtls_test_unhexify((uint8_t *)&value, sizeof(value), c, &len) == 0);
+ TEST_HELPER_ASSERT(len != 8);
- return value ;
+ return value;
}
/**
@@ -122,17 +111,16 @@
*
* \return unsigned int
*/
-uint32_t parse_uint32( uint8_t * p )
+uint32_t parse_uint32(uint8_t *p)
{
uint32_t value;
- value = *p++ << 24;
+ value = *p++ << 24;
value |= *p++ << 16;
value |= *p++ << 8;
value |= *p;
- return value ;
+ return value;
}
-
/**
* \brief Receives test data on serial as greentea key,value pair:
* {{<length>;<byte array>}}
@@ -141,54 +129,50 @@
*
* \return Byte array.
*/
-uint8_t * receive_data( uint32_t * data_len )
+uint8_t *receive_data(uint32_t *data_len)
{
uint32_t i = 0, errors = 0;
char c;
- uint8_t * data = NULL;
+ uint8_t *data = NULL;
/* Read opening braces */
i = 0;
- while ( i < 2 )
- {
+ while (i < 2) {
c = greentea_getc();
/* Ignore any prevous CR LF characters */
- if ( c == '\n' || c == '\r' )
+ if (c == '\n' || c == '\r')
continue;
i++;
- if ( c != '{' )
- return NULL ;
+ if (c != '{')
+ return NULL;
}
/* Read data length */
*data_len = receive_uint32();
- data = (uint8_t *)malloc( *data_len );
- TEST_HELPER_ASSERT( data != NULL );
+ data = (uint8_t *)malloc(*data_len);
+ TEST_HELPER_ASSERT(data != NULL);
greentea_getc(); // read ';' received after key i.e. *data_len
- for( i = 0; i < *data_len; i++ )
+ for (i = 0; i < *data_len; i++)
data[i] = receive_byte();
/* Read closing braces */
- for( i = 0; i < 2; i++ )
- {
+ for (i = 0; i < 2; i++) {
c = greentea_getc();
- if ( c != '}' )
- {
+ if (c != '}') {
errors++;
break;
}
}
- if ( errors )
- {
- free( data );
+ if (errors) {
+ free(data);
data = NULL;
*data_len = 0;
}
- return data ;
+ return data;
}
/**
@@ -201,36 +185,34 @@
*
* \return count of hex params
*/
-uint32_t find_hex_count( uint8_t count, uint8_t * data, uint32_t data_len )
+uint32_t find_hex_count(uint8_t count, uint8_t *data, uint32_t data_len)
{
uint32_t i = 0, sz = 0;
char c;
- uint8_t * p = NULL;
+ uint8_t *p = NULL;
uint32_t hex_count = 0;
p = data;
- for( i = 0; i < count; i++ )
- {
+ for (i = 0; i < count; i++) {
c = (char)*p;
- INCR_ASSERT( p, data, data_len, 1 );
+ INCR_ASSERT(p, data, data_len, 1);
/* Align p to 4 bytes for int, expression, string len or hex length */
- ALIGN_32BIT( p, data, data_len );
+ ALIGN_32BIT(p, data, data_len);
/* Network to host conversion */
- sz = (int32_t)parse_uint32( p );
+ sz = (int32_t)parse_uint32(p);
- INCR_ASSERT( p, data, data_len, sizeof( int32_t ) );
+ INCR_ASSERT(p, data, data_len, sizeof(int32_t));
- if ( c == 'H' || c == 'S' )
- {
- INCR_ASSERT( p, data, data_len, sz );
- hex_count += ( c == 'H' )?1:0;
+ if (c == 'H' || c == 'S') {
+ INCR_ASSERT(p, data, data_len, sz);
+ hex_count += (c == 'H') ? 1 : 0;
}
}
- return hex_count ;
+ return hex_count;
}
/**
@@ -245,41 +227,38 @@
* Note: Caller has the responsibility to delete
* the memory after use.
*/
-void ** parse_parameters( uint8_t count, uint8_t * data, uint32_t data_len,
- int * error )
+void **
+parse_parameters(uint8_t count, uint8_t *data, uint32_t data_len, int *error)
{
uint32_t i = 0, hex_count = 0;
char c;
- void ** params = NULL;
- void ** cur = NULL;
- uint8_t * p = NULL;
+ void **params = NULL;
+ void **cur = NULL;
+ uint8_t *p = NULL;
hex_count = find_hex_count(count, data, data_len);
- params = (void **)malloc( sizeof( void *) * ( count + hex_count ) );
- TEST_HELPER_ASSERT( params != NULL );
+ params = (void **)malloc(sizeof(void *) * (count + hex_count));
+ TEST_HELPER_ASSERT(params != NULL);
cur = params;
p = data;
/* Parameters */
- for( i = 0; i < count; i++ )
- {
+ for (i = 0; i < count; i++) {
c = (char)*p;
- INCR_ASSERT( p, data, data_len, 1 );
+ INCR_ASSERT(p, data, data_len, 1);
/* Align p to 4 bytes for int, expression, string len or hex length */
- ALIGN_32BIT( p, data, data_len );
+ ALIGN_32BIT(p, data, data_len);
/* Network to host conversion */
- *( (int32_t *)p ) = (int32_t)parse_uint32( p );
+ *((int32_t *)p) = (int32_t)parse_uint32(p);
- switch( c )
- {
+ switch (c) {
case 'E':
{
- if ( get_expression( *( (int32_t *)p ), (int32_t *)p ) )
- {
+ if (get_expression(*((int32_t *)p), (int32_t *)p)) {
*error = KEY_VALUE_MAPPING_NOT_FOUND;
goto exit;
}
@@ -287,37 +266,36 @@
case 'I':
{
*cur++ = (void *)p;
- INCR_ASSERT( p, data, data_len, sizeof( int32_t ) );
+ INCR_ASSERT(p, data, data_len, sizeof(int32_t));
}
break;
case 'H': /* Intentional fall through */
case 'S':
{
- uint32_t * sz = (uint32_t *)p;
- INCR_ASSERT( p, data, data_len, sizeof( int32_t ) );
+ uint32_t *sz = (uint32_t *)p;
+ INCR_ASSERT(p, data, data_len, sizeof(int32_t));
*cur++ = (void *)p;
- if ( c == 'H' )
+ if (c == 'H')
*cur++ = (void *)sz;
- INCR_ASSERT( p, data, data_len, ( *sz ) );
+ INCR_ASSERT(p, data, data_len, (*sz));
}
break;
default:
- {
- *error = DISPATCH_INVALID_TEST_DATA;
- goto exit;
- }
+ {
+ *error = DISPATCH_INVALID_TEST_DATA;
+ goto exit;
+ }
break;
}
}
exit:
- if ( *error )
- {
- free( params );
+ if (*error) {
+ free(params);
params = NULL;
}
- return params ;
+ return params;
}
/**
@@ -328,11 +306,11 @@
*
* \return void
*/
-void send_key_integer( char * key, int value )
+void send_key_integer(char *key, int value)
{
char str[50];
- snprintf( str, sizeof( str ), "%d", value );
- greentea_send_kv( key, str );
+ snprintf(str, sizeof(str), "%d", value);
+ greentea_send_kv(key, str);
}
/**
@@ -342,9 +320,9 @@
*
* \return void
*/
-void send_failure( int failure )
+void send_failure(int failure)
{
- send_key_integer( "F", failure );
+ send_key_integer("F", failure);
}
/**
@@ -354,12 +332,11 @@
*
* \return void
*/
-void send_status( int status )
+void send_status(int status)
{
- send_key_integer( "R", status );
+ send_key_integer("R", status);
}
-
/**
* \brief Embedded implementation of execute_tests().
* Ignores command line and received test data
@@ -370,80 +347,74 @@
*
* \return Program exit status.
*/
-int execute_tests( int args, const char ** argv )
+int execute_tests(int args, const char **argv)
{
int ret = 0;
uint32_t data_len = 0;
uint8_t count = 0, function_id;
- void ** params = NULL;
- uint8_t * data = NULL, * p = NULL;
+ void **params = NULL;
+ uint8_t *data = NULL, *p = NULL;
- GREENTEA_SETUP( 800, "mbedtls_test" );
- greentea_send_kv( "GO", " " );
+ GREENTEA_SETUP(800, "mbedtls_test");
+ greentea_send_kv("GO", " ");
- while ( 1 )
- {
+ while (1) {
ret = 0;
- mbedtls_test_info_reset( );
+ mbedtls_test_info_reset();
data_len = 0;
- data = receive_data( &data_len );
- if ( data == NULL )
+ data = receive_data(&data_len);
+ if (data == NULL)
continue;
p = data;
- do
- {
+ do {
/* Read dependency count */
count = *p;
- TEST_HELPER_ASSERT( count < data_len );
- INCR_ASSERT( p, data, data_len, sizeof( uint8_t ) );
- ret = verify_dependencies( count, p );
- if ( ret != DEPENDENCY_SUPPORTED )
+ TEST_HELPER_ASSERT(count < data_len);
+ INCR_ASSERT(p, data, data_len, sizeof(uint8_t));
+ ret = verify_dependencies(count, p);
+ if (ret != DEPENDENCY_SUPPORTED)
break;
- if ( count )
- INCR_ASSERT( p, data, data_len, count );
+ if (count)
+ INCR_ASSERT(p, data, data_len, count);
/* Read function id */
function_id = *p;
- INCR_ASSERT( p, data, data_len, sizeof( uint8_t ) );
- if ( ( ret = check_test( function_id ) ) != DISPATCH_TEST_SUCCESS )
+ INCR_ASSERT(p, data, data_len, sizeof(uint8_t));
+ if ((ret = check_test(function_id)) != DISPATCH_TEST_SUCCESS)
break;
/* Read number of parameters */
count = *p;
- INCR_ASSERT( p, data, data_len, sizeof( uint8_t ) );
+ INCR_ASSERT(p, data, data_len, sizeof(uint8_t));
/* Parse parameters if present */
- if ( count )
- {
- params = parse_parameters( count, p, data_len - ( p - data ), &ret );
- if ( ret )
+ if (count) {
+ params =
+ parse_parameters(count, p, data_len - (p - data), &ret);
+ if (ret)
break;
}
- ret = dispatch_test( function_id, params );
- }
- while ( 0 );
+ ret = dispatch_test(function_id, params);
+ } while (0);
- if ( data )
- {
- free( data );
+ if (data) {
+ free(data);
data = NULL;
}
- if ( params )
- {
- free( params );
+ if (params) {
+ free(params);
params = NULL;
}
- if ( ret )
- send_failure( ret );
+ if (ret)
+ send_failure(ret);
else
- send_status( mbedtls_test_info.result );
+ send_status(mbedtls_test_info.result);
}
- return 0 ;
+ return 0;
}
-