Skip to content

Commit bdc355f

Browse files
author
Seppo Takalo
committed
Astyle fixes
1 parent 5d170f2 commit bdc355f

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class TestDTLSSocketWrapper : public testing::Test {
3636
unsigned int dataSize = 10;
3737
char dataBuf[10];
3838
protected:
39-
UDPSocket* transport;
39+
UDPSocket *transport;
4040
DTLSSocketWrapper *wrapper;
4141
NetworkStackstub stack;
4242

@@ -60,7 +60,7 @@ class TestDTLSSocketWrapper : public testing::Test {
6060
delete wrapper;
6161
}
6262

63-
char* cert = "-----BEGIN CERTIFICATE-----\
63+
char *cert = "-----BEGIN CERTIFICATE-----\
6464
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\
6565
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\
6666
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\
@@ -304,10 +304,10 @@ TEST_F(TestDTLSSocketWrapper, recv_from_null)
304304

305305
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert)
306306
{
307-
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL));
307+
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
308308
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
309309
EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
310-
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL));
310+
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
311311
}
312312

313313
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_nolen)
@@ -327,10 +327,10 @@ TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
327327

328328
TEST_F(TestDTLSSocketWrapper, set_client_cert_key)
329329
{
330-
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL));
330+
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
331331
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
332332
EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
333-
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL));
333+
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
334334
}
335335

336336
TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid)

‎UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class TestTLSSocketWrapper : public testing::Test {
3636
unsigned int dataSize = 10;
3737
char dataBuf[10];
3838
protected:
39-
TCPSocket* transport;
39+
TCPSocket *transport;
4040
TLSSocketWrapper *wrapper;
4141
NetworkStackstub stack;
4242

@@ -58,7 +58,7 @@ class TestTLSSocketWrapper : public testing::Test {
5858
delete wrapper;
5959
}
6060

61-
char* cert = "-----BEGIN CERTIFICATE-----\
61+
char *cert = "-----BEGIN CERTIFICATE-----\
6262
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\
6363
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\
6464
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\
@@ -319,10 +319,10 @@ TEST_F(TestTLSSocketWrapper, recv_from_null)
319319

320320
TEST_F(TestTLSSocketWrapper, set_root_ca_cert)
321321
{
322-
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL));
322+
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
323323
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
324324
EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
325-
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL));
325+
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
326326
}
327327

328328
TEST_F(TestTLSSocketWrapper, set_root_ca_cert_nolen)
@@ -341,10 +341,10 @@ TEST_F(TestTLSSocketWrapper, set_root_ca_cert_invalid)
341341

342342
TEST_F(TestTLSSocketWrapper, set_client_cert_key)
343343
{
344-
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL));
344+
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
345345
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
346346
EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
347-
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL));
347+
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
348348
}
349349

350350
TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid)

‎UNITTESTS/stubs/NetworkStack_stub.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ class NetworkStackstub : public NetworkStack {
114114
virtual nsapi_size_or_error_t socket_recvfrom(nsapi_socket_t handle, SocketAddress *address,
115115
void *buffer, nsapi_size_t size)
116116
{
117-
if (return_socketAddress != SocketAddress())
118-
{
117+
if (return_socketAddress != SocketAddress()) {
119118
*address = return_socketAddress;
120119
}
121120
if (!return_values.empty()) {

‎features/netsocket/DTLSSocket.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ nsapi_error_t DTLSSocket::connect(const char *host, uint16_t port)
5050

5151
DTLSSocket::~DTLSSocket()
5252
{
53-
/* Make sure that DTLSSocketWrapper::close() is called before the transport is
54-
* destroyed.
55-
*/
53+
// Make sure that DTLSSocketWrapper::close() is called before the transport is
54+
// destroyed.
5655
close();
5756
}
5857

‎features/netsocket/DTLSSocket.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,14 @@ class DTLSSocket : public DTLSSocketWrapper {
6262
* @param stack Network stack as target for socket
6363
* @return 0 on success, negative error code on failure
6464
*/
65-
virtual nsapi_error_t open(NetworkStack *stack) {
65+
virtual nsapi_error_t open(NetworkStack *stack)
66+
{
6667
return _udp_socket.open(stack);
6768
}
6869

6970
template <typename S>
70-
nsapi_error_t open(S *stack) {
71+
nsapi_error_t open(S *stack)
72+
{
7173
return open(nsapi_create_stack(stack));
7274
}
7375

‎features/netsocket/DTLSSocketWrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ DTLSSocketWrapper::DTLSSocketWrapper(Socket *transport, const char *hostname, co
1212
_timer_event_id(0),
1313
_timer_expired(false)
1414
{
15-
mbedtls_ssl_conf_transport( get_ssl_config(), MBEDTLS_SSL_TRANSPORT_DATAGRAM);
16-
mbedtls_ssl_set_timer_cb( get_ssl_context(), this, timing_set_delay, timing_get_delay);
15+
mbedtls_ssl_conf_transport(get_ssl_config(), MBEDTLS_SSL_TRANSPORT_DATAGRAM);
16+
mbedtls_ssl_set_timer_cb(get_ssl_context(), this, timing_set_delay, timing_get_delay);
1717
}
1818

1919
void DTLSSocketWrapper::timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms)

‎features/netsocket/DTLSSocketWrapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DTLSSocketWrapper : public TLSSocketWrapper {
1515
void timer_event();
1616
uint64_t _int_ms_tick;
1717
int _timer_event_id;
18-
bool _timer_expired:1;
18+
bool _timer_expired : 1;
1919
};
2020

2121
#endif

‎features/netsocket/TLSSocketWrapper.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call)
160160
}
161161

162162
#ifdef MBEDTLS_X509_CRT_PARSE_C
163-
/* Start the handshake, the rest will be done in onReceive() */
164163
tr_info("Starting TLS handshake with %s", _ssl.hostname);
165164
#else
166165
tr_info("Starting TLS handshake");
@@ -198,7 +197,7 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call)
198197

199198
ret = continue_handshake();
200199
if (first_call) {
201-
if (ret == NSAPI_ERROR_ALREADY ) {
200+
if (ret == NSAPI_ERROR_ALREADY) {
202201
ret = NSAPI_ERROR_IN_PROGRESS; // If first call should return IN_PROGRESS
203202
}
204203
if (ret == NSAPI_ERROR_IS_CONNECTED) {
@@ -208,7 +207,8 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call)
208207
return ret;
209208
}
210209

211-
nsapi_error_t TLSSocketWrapper::continue_handshake() {
210+
nsapi_error_t TLSSocketWrapper::continue_handshake()
211+
{
212212
int ret;
213213

214214
if (_handshake_completed) {
@@ -623,13 +623,13 @@ nsapi_error_t TLSSocketWrapper::bind(const SocketAddress &address)
623623

624624
void TLSSocketWrapper::set_blocking(bool blocking)
625625
{
626-
set_timeout(blocking?-1:0);
626+
set_timeout(blocking ? -1 : 0);
627627
}
628628

629629
void TLSSocketWrapper::set_timeout(int timeout)
630630
{
631631
_timeout = timeout;
632-
if (!is_handshake_started() && timeout!=-1 && _connect_transport) {
632+
if (!is_handshake_started() && timeout != -1 && _connect_transport) {
633633
// If we have not yet connected the transport, we need to modify its blocking mode as well.
634634
// After connection is initiated, it is already set to non blocking mode
635635
_transport->set_timeout(timeout);
@@ -641,7 +641,7 @@ void TLSSocketWrapper::sigio(mbed::Callback<void()> func)
641641
if (!_transport) {
642642
return;
643643
}
644-
_sigio = func;
644+
_sigio = func;
645645
_transport->sigio(mbed::callback(this, &TLSSocketWrapper::event));
646646
}
647647

@@ -676,7 +676,7 @@ nsapi_error_t TLSSocketWrapper::listen(int)
676676

677677
void TLSSocketWrapper::event()
678678
{
679-
_event_flag.set(1);
679+
_event_flag.set(1);
680680
if (_sigio) {
681681
_sigio();
682682
}

0 commit comments

Comments
 (0)