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/asn1write.c b/library/asn1write.c
index 0289e89..8391e80 100644
--- a/library/asn1write.c
+++ b/library/asn1write.c
@@ -39,43 +39,43 @@
if( len < 0x80 )
{
if( *p - start < 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = (unsigned char) len;
- return( 1 );
+ return 1 ;
}
if( len <= 0xFF )
{
if( *p - start < 2 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = (unsigned char) len;
*--(*p) = 0x81;
- return( 2 );
+ return 2 ;
}
if( len <= 0xFFFF )
{
if( *p - start < 3 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = ( len ) & 0xFF;
*--(*p) = ( len >> 8 ) & 0xFF;
*--(*p) = 0x82;
- return( 3 );
+ return 3 ;
}
if( len <= 0xFFFFFF )
{
if( *p - start < 4 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = ( len ) & 0xFF;
*--(*p) = ( len >> 8 ) & 0xFF;
*--(*p) = ( len >> 16 ) & 0xFF;
*--(*p) = 0x83;
- return( 4 );
+ return 4 ;
}
#if SIZE_MAX > 0xFFFFFFFF
@@ -83,29 +83,29 @@
#endif
{
if( *p - start < 5 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = ( len ) & 0xFF;
*--(*p) = ( len >> 8 ) & 0xFF;
*--(*p) = ( len >> 16 ) & 0xFF;
*--(*p) = ( len >> 24 ) & 0xFF;
*--(*p) = 0x84;
- return( 5 );
+ return 5 ;
}
#if SIZE_MAX > 0xFFFFFFFF
- return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+ return MBEDTLS_ERR_ASN1_INVALID_LENGTH ;
#endif
}
int mbedtls_asn1_write_tag( unsigned char **p, const unsigned char *start, unsigned char tag )
{
if( *p - start < 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = tag;
- return( 1 );
+ return 1 ;
}
int mbedtls_asn1_write_raw_buffer( unsigned char **p, const unsigned char *start,
@@ -114,13 +114,13 @@
size_t len = 0;
if( *p < start || (size_t)( *p - start ) < size )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
len = size;
(*p) -= len;
memcpy( *p, buf, len );
- return( (int) len );
+ return (int) len ;
}
#if defined(MBEDTLS_BIGNUM_C)
@@ -134,7 +134,7 @@
len = mbedtls_mpi_size( X );
if( *p < start || (size_t)( *p - start ) < len )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
(*p) -= len;
MBEDTLS_MPI_CHK( mbedtls_mpi_write_binary( X, *p, len ) );
@@ -145,7 +145,7 @@
if( X->s ==1 && **p & 0x80 )
{
if( *p - start < 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = 0x00;
len += 1;
@@ -157,7 +157,7 @@
ret = (int) len;
cleanup:
- return( ret );
+ return ret ;
}
#endif /* MBEDTLS_BIGNUM_C */
@@ -171,7 +171,7 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, 0) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_NULL ) );
- return( (int) len );
+ return (int) len ;
}
int mbedtls_asn1_write_oid( unsigned char **p, const unsigned char *start,
@@ -185,7 +185,7 @@
MBEDTLS_ASN1_CHK_ADD( len , mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len , mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_OID ) );
- return( (int) len );
+ return (int) len ;
}
int mbedtls_asn1_write_algorithm_identifier( unsigned char **p, const unsigned char *start,
@@ -206,7 +206,7 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
- return( (int) len );
+ return (int) len ;
}
int mbedtls_asn1_write_bool( unsigned char **p, const unsigned char *start, int boolean )
@@ -215,7 +215,7 @@
size_t len = 0;
if( *p - start < 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = (boolean) ? 255 : 0;
len++;
@@ -223,7 +223,7 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BOOLEAN ) );
- return( (int) len );
+ return (int) len ;
}
static int asn1_write_tagged_int( unsigned char **p, const unsigned char *start, int val, int tag )
@@ -234,7 +234,7 @@
do
{
if( *p - start < 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
len += 1;
*--(*p) = val & 0xff;
val >>= 8;
@@ -244,7 +244,7 @@
if( **p & 0x80 )
{
if( *p - start < 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
*--(*p) = 0x00;
len += 1;
}
@@ -252,17 +252,17 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, tag ) );
- return( (int) len );
+ return (int) len ;
}
int mbedtls_asn1_write_int( unsigned char **p, const unsigned char *start, int val )
{
- return( asn1_write_tagged_int( p, start, val, MBEDTLS_ASN1_INTEGER ) );
+ return asn1_write_tagged_int( p, start, val, MBEDTLS_ASN1_INTEGER ) ;
}
int mbedtls_asn1_write_enum( unsigned char **p, const unsigned char *start, int val )
{
- return( asn1_write_tagged_int( p, start, val, MBEDTLS_ASN1_ENUMERATED ) );
+ return asn1_write_tagged_int( p, start, val, MBEDTLS_ASN1_ENUMERATED ) ;
}
int mbedtls_asn1_write_tagged_string( unsigned char **p, const unsigned char *start, int tag,
@@ -277,25 +277,25 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, tag ) );
- return( (int) len );
+ return (int) len ;
}
int mbedtls_asn1_write_utf8_string( unsigned char **p, const unsigned char *start,
const char *text, size_t text_len )
{
- return( mbedtls_asn1_write_tagged_string(p, start, MBEDTLS_ASN1_UTF8_STRING, text, text_len) );
+ return mbedtls_asn1_write_tagged_string(p, start, MBEDTLS_ASN1_UTF8_STRING, text, text_len) ;
}
int mbedtls_asn1_write_printable_string( unsigned char **p, const unsigned char *start,
const char *text, size_t text_len )
{
- return( mbedtls_asn1_write_tagged_string(p, start, MBEDTLS_ASN1_PRINTABLE_STRING, text, text_len) );
+ return mbedtls_asn1_write_tagged_string(p, start, MBEDTLS_ASN1_PRINTABLE_STRING, text, text_len) ;
}
int mbedtls_asn1_write_ia5_string( unsigned char **p, const unsigned char *start,
const char *text, size_t text_len )
{
- return( mbedtls_asn1_write_tagged_string(p, start, MBEDTLS_ASN1_IA5_STRING, text, text_len) );
+ return mbedtls_asn1_write_tagged_string(p, start, MBEDTLS_ASN1_IA5_STRING, text, text_len) ;
}
int mbedtls_asn1_write_named_bitstring( unsigned char **p,
@@ -338,7 +338,7 @@
}
}
- return( mbedtls_asn1_write_bitstring( p, start, buf, bits ) );
+ return mbedtls_asn1_write_bitstring( p, start, buf, bits ) ;
}
int mbedtls_asn1_write_bitstring( unsigned char **p, const unsigned char *start,
@@ -352,7 +352,7 @@
unused_bits = ( byte_len * 8 ) - bits;
if( *p < start || (size_t)( *p - start ) < byte_len + 1 )
- return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
+ return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ;
len = byte_len + 1;
@@ -371,7 +371,7 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BIT_STRING ) );
- return( (int) len );
+ return (int) len ;
}
int mbedtls_asn1_write_octet_string( unsigned char **p, const unsigned char *start,
@@ -385,7 +385,7 @@
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_OCTET_STRING ) );
- return( (int) len );
+ return (int) len ;
}
@@ -406,7 +406,7 @@
list = list->next;
}
- return( list );
+ return list ;
}
mbedtls_asn1_named_data *mbedtls_asn1_store_named_data(
@@ -424,14 +424,14 @@
cur = (mbedtls_asn1_named_data*)mbedtls_calloc( 1,
sizeof(mbedtls_asn1_named_data) );
if( cur == NULL )
- return( NULL );
+ return NULL ;
cur->oid.len = oid_len;
cur->oid.p = mbedtls_calloc( 1, oid_len );
if( cur->oid.p == NULL )
{
mbedtls_free( cur );
- return( NULL );
+ return NULL ;
}
memcpy( cur->oid.p, oid, oid_len );
@@ -444,7 +444,7 @@
{
mbedtls_free( cur->oid.p );
mbedtls_free( cur );
- return( NULL );
+ return NULL ;
}
}
@@ -465,7 +465,7 @@
*/
void *p = mbedtls_calloc( 1, val_len );
if( p == NULL )
- return( NULL );
+ return NULL ;
mbedtls_free( cur->val.p );
cur->val.p = p;
@@ -475,6 +475,6 @@
if( val != NULL )
memcpy( cur->val.p, val, val_len );
- return( cur );
+ return cur ;
}
#endif /* MBEDTLS_ASN1_WRITE_C */