Fix parantheses on return and sizeof statements.
Used script:
```
import re
import sys
for arg in sys.argv[1:]:
print(arg)
with open(arg, 'r') as file:
content = file.read()
content = re.sub(r"return\s?\((?!.*\).*\()\s*\n?(.*)\n?\);", r"return \1;", \
content, flags = re.M)
content = re.sub(r"sizeof ([^\(][a-zA-Z0-9_\[\]]*)", r"sizeof(\1)",\
content, flags = re.M)
with open(arg, 'w') as file:
file.write(content)
```
Executed with:
` find . -regextype posix-egrep -regex ".*\.([hc]|fmt|function)" | xargs -L1 python script.py`
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c
index a3ee157..e7eaee2 100644
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@@ -1905,7 +1905,7 @@
#if defined(MBEDTLS_SSL_CIPHERSUITES)
const int *mbedtls_ssl_list_ciphersuites( void )
{
- return( ciphersuite_preference );
+ return ciphersuite_preference ;
}
#else
#define MAX_CIPHERSUITES sizeof( ciphersuite_definitions ) / \
@@ -1917,7 +1917,7 @@
{
(void)cs_info;
- return( 0 );
+ return 0 ;
}
const int *mbedtls_ssl_list_ciphersuites( void )
@@ -1947,7 +1947,7 @@
supported_init = 1;
}
- return( supported_ciphersuites );
+ return supported_ciphersuites ;
}
#endif /* MBEDTLS_SSL_CIPHERSUITES */
@@ -1957,17 +1957,17 @@
const mbedtls_ssl_ciphersuite_t *cur = ciphersuite_definitions;
if( NULL == ciphersuite_name )
- return( NULL );
+ return NULL ;
while( cur->id != 0 )
{
if( 0 == strcmp( cur->name, ciphersuite_name ) )
- return( cur );
+ return cur ;
cur++;
}
- return( NULL );
+ return NULL ;
}
const mbedtls_ssl_ciphersuite_t *mbedtls_ssl_ciphersuite_from_id( int ciphersuite )
@@ -1977,12 +1977,12 @@
while( cur->id != 0 )
{
if( cur->id == ciphersuite )
- return( cur );
+ return cur ;
cur++;
}
- return( NULL );
+ return NULL ;
}
const char *mbedtls_ssl_get_ciphersuite_name( const int ciphersuite_id )
@@ -1992,9 +1992,9 @@
cur = mbedtls_ssl_ciphersuite_from_id( ciphersuite_id );
if( cur == NULL )
- return( "unknown" );
+ return "unknown" ;
- return( cur->name );
+ return cur->name ;
}
int mbedtls_ssl_get_ciphersuite_id( const char *ciphersuite_name )
@@ -2004,9 +2004,9 @@
cur = mbedtls_ssl_ciphersuite_from_string( ciphersuite_name );
if( cur == NULL )
- return( 0 );
+ return 0 ;
- return( cur->id );
+ return cur->id ;
}
#if defined(MBEDTLS_PK_C)
@@ -2018,17 +2018,17 @@
case MBEDTLS_KEY_EXCHANGE_DHE_RSA:
case MBEDTLS_KEY_EXCHANGE_ECDHE_RSA:
case MBEDTLS_KEY_EXCHANGE_RSA_PSK:
- return( MBEDTLS_PK_RSA );
+ return MBEDTLS_PK_RSA ;
case MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA:
- return( MBEDTLS_PK_ECDSA );
+ return MBEDTLS_PK_ECDSA ;
case MBEDTLS_KEY_EXCHANGE_ECDH_RSA:
case MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA:
- return( MBEDTLS_PK_ECKEY );
+ return MBEDTLS_PK_ECKEY ;
default:
- return( MBEDTLS_PK_NONE );
+ return MBEDTLS_PK_NONE ;
}
}
@@ -2039,13 +2039,13 @@
case MBEDTLS_KEY_EXCHANGE_RSA:
case MBEDTLS_KEY_EXCHANGE_DHE_RSA:
case MBEDTLS_KEY_EXCHANGE_ECDHE_RSA:
- return( MBEDTLS_PK_RSA );
+ return MBEDTLS_PK_RSA ;
case MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA:
- return( MBEDTLS_PK_ECDSA );
+ return MBEDTLS_PK_ECDSA ;
default:
- return( MBEDTLS_PK_NONE );
+ return MBEDTLS_PK_NONE ;
}
}
@@ -2063,10 +2063,10 @@
case MBEDTLS_KEY_EXCHANGE_ECDH_RSA:
case MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA:
case MBEDTLS_KEY_EXCHANGE_ECJPAKE:
- return( 1 );
+ return 1 ;
default:
- return( 0 );
+ return 0 ;
}
}
#endif /* MBEDTLS_ECDH_C || MBEDTLS_ECDSA_C || MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED*/
@@ -2080,10 +2080,10 @@
case MBEDTLS_KEY_EXCHANGE_RSA_PSK:
case MBEDTLS_KEY_EXCHANGE_DHE_PSK:
case MBEDTLS_KEY_EXCHANGE_ECDHE_PSK:
- return( 1 );
+ return 1 ;
default:
- return( 0 );
+ return 0 ;
}
}
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */