Skip to content

Commit 83d62fb

Browse files
author
Antti Kauppila
committed
astyle fixes
1 parent 77e8374 commit 83d62fb

File tree

7 files changed

+36
-33
lines changed

7 files changed

+36
-33
lines changed

‎UNITTESTS/stubs/ATHandler_stub.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,23 +431,26 @@ void ATHandler::flush()
431431

432432
}
433433

434-
nsapi_error_t ATHandler::at_cmd_str(const char *cmd, const char* cmd_chr, char *resp_buf, size_t buf_size, const char* format, ...)
434+
nsapi_error_t ATHandler::at_cmd_str(const char *cmd, const char *cmd_chr, char *resp_buf,
435+
size_t buf_size, const char *format, ...)
435436
{
436437
read_string(resp_buf, buf_size);
437438
return ATHandler_stub::nsapi_error_value;
438439
}
439440

440-
nsapi_error_t ATHandler::at_cmd_int(const char *cmd, const char* cmd_chr, int &resp, const char* format, ...)
441+
nsapi_error_t ATHandler::at_cmd_int(const char *cmd, const char *cmd_chr, int &resp,
442+
const char *format, ...)
441443
{
442444
resp = read_int();
443445
return ATHandler_stub::nsapi_error_value;
444446
}
445447

446-
void ATHandler::cmd_start_stop(const char *cmd, const char* cmd_chr, const char* format, ...)
448+
void ATHandler::cmd_start_stop(const char *cmd, const char *cmd_chr, const char *format, ...)
447449
{
448450
}
449451

450-
nsapi_error_t ATHandler::at_cmd_discard(const char *cmd, const char* cmd_chr, const char* format, ...)
452+
nsapi_error_t ATHandler::at_cmd_discard(const char *cmd, const char *cmd_chr,
453+
const char *format, ...)
451454
{
452455
return ATHandler_stub::nsapi_error_value;
453456
}

‎features/cellular/framework/AT/ATHandler.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,17 +1142,17 @@ void ATHandler::cmd_start(const char *cmd)
11421142
_cmd_start = true;
11431143
}
11441144

1145-
void ATHandler::handle_args(const char* format, va_list list)
1145+
void ATHandler::handle_args(const char *format, va_list list)
11461146
{
11471147
while (*format != '\0') {
11481148
if (*format == 'd') {
11491149
int i = va_arg(list, int);
11501150
write_int(i);
11511151
} else if (*format == 's') {
1152-
char * str = (char *)va_arg(list, char*);
1152+
char *str = (char *)va_arg(list, char *);
11531153
write_string(str);
11541154
} else if (*format == 'b') {
1155-
uint8_t *bytes = va_arg(list, uint8_t*);
1155+
uint8_t *bytes = va_arg(list, uint8_t *);
11561156
int size = va_arg(list, int);
11571157
write_bytes(bytes, size);
11581158
}
@@ -1164,7 +1164,7 @@ void ATHandler::handle_start(const char *cmd, const char *cmd_chr)
11641164
{
11651165
int len = 0;
11661166
memcpy(_cmd_buffer, "AT", 2);
1167-
len +=2;
1167+
len += 2;
11681168
memcpy(_cmd_buffer + len, cmd, strlen(cmd));
11691169
len += strlen(cmd);
11701170

@@ -1176,7 +1176,7 @@ void ATHandler::handle_start(const char *cmd, const char *cmd_chr)
11761176
cmd_start(_cmd_buffer);
11771177
}
11781178

1179-
void ATHandler::cmd_start_stop(const char *cmd, const char* cmd_chr, const char* format, ...)
1179+
void ATHandler::cmd_start_stop(const char *cmd, const char *cmd_chr, const char *format, ...)
11801180
{
11811181
handle_start(cmd, cmd_chr);
11821182

@@ -1188,7 +1188,7 @@ void ATHandler::cmd_start_stop(const char *cmd, const char* cmd_chr, const char*
11881188
cmd_stop();
11891189
}
11901190

1191-
nsapi_error_t ATHandler::at_cmd_str(const char *cmd, const char* cmd_chr, char *resp_buf, size_t buf_size, const char* format, ...)
1191+
nsapi_error_t ATHandler::at_cmd_str(const char *cmd, const char *cmd_chr, char *resp_buf, size_t buf_size, const char *format, ...)
11921192
{
11931193
lock();
11941194

@@ -1203,15 +1203,15 @@ nsapi_error_t ATHandler::at_cmd_str(const char *cmd, const char* cmd_chr, char *
12031203

12041204
memcpy(_cmd_buffer, cmd, strlen(cmd));
12051205
_cmd_buffer[strlen(cmd)] = ':';
1206-
_cmd_buffer[strlen(cmd)+1] = '\0';
1206+
_cmd_buffer[strlen(cmd) + 1] = '\0';
12071207
resp_start(_cmd_buffer);
12081208

12091209
read_string(resp_buf, buf_size);
12101210
resp_stop();
12111211
return unlock_return_error();
12121212
}
12131213

1214-
nsapi_error_t ATHandler::at_cmd_int(const char *cmd, const char* cmd_chr, int &resp, const char* format, ...)
1214+
nsapi_error_t ATHandler::at_cmd_int(const char *cmd, const char *cmd_chr, int &resp, const char *format, ...)
12151215
{
12161216
lock();
12171217

@@ -1227,15 +1227,15 @@ nsapi_error_t ATHandler::at_cmd_int(const char *cmd, const char* cmd_chr, int &r
12271227
size_t len = strlen(cmd);
12281228
memcpy(temp, cmd, len);
12291229
temp[len] = ':';
1230-
temp[len+1] = '\0';
1230+
temp[len + 1] = '\0';
12311231
resp_start(temp);
12321232

12331233
resp = read_int();
12341234
resp_stop();
12351235
return unlock_return_error();
12361236
}
12371237

1238-
nsapi_error_t ATHandler::at_cmd_discard(const char *cmd, const char* cmd_chr, const char* format, ...)
1238+
nsapi_error_t ATHandler::at_cmd_discard(const char *cmd, const char *cmd_chr, const char *format, ...)
12391239
{
12401240
lock();
12411241

‎features/cellular/framework/AT/ATHandler.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ class ATHandler {
271271
* @param format Format string for variadic arguments to be added to AT command; No separator needed.
272272
* Use %d for integer, %s for string and %b for byte string (requires 2 arguments: string and length)
273273
*/
274-
void cmd_start_stop(const char *cmd, const char* cmd_chr, const char* format = "", ...);
274+
void cmd_start_stop(const char *cmd, const char *cmd_chr, const char *format = "", ...);
275275

276276
/**
277277
* @brief at_cmd_str Send an AT command and read 1 line string response. Locks and unlocks ATHandler for operation
@@ -283,7 +283,7 @@ class ATHandler {
283283
* Use %d for integer, %s for string and %b for byte string (requires 2 arguments: string and length)
284284
* @return @return last error that happened when parsing AT responses
285285
*/
286-
nsapi_error_t at_cmd_str(const char *cmd, const char* cmd_chr, char *resp_buf, size_t resp_buf_size, const char* format = "", ...);
286+
nsapi_error_t at_cmd_str(const char *cmd, const char *cmd_chr, char *resp_buf, size_t resp_buf_size, const char *format = "", ...);
287287

288288
/**
289289
* @brief at_cmd_int Send an AT command and read 1 line integer response. Locks and unlocks ATHandler for operation
@@ -294,7 +294,7 @@ class ATHandler {
294294
* Use %d for integer, %s for string and %b for byte string (requires 2 arguments: string and length)
295295
* @return @return last error that happened when parsing AT responses
296296
*/
297-
nsapi_error_t at_cmd_int(const char *cmd, const char* cmd_chr, int &resp, const char* format = "", ...);
297+
nsapi_error_t at_cmd_int(const char *cmd, const char *cmd_chr, int &resp, const char *format = "", ...);
298298

299299
/**
300300
* @brief at_cmd_discard Send an AT command and read and discard a response. Locks and unlocks ATHandler for operation
@@ -305,7 +305,7 @@ class ATHandler {
305305
* Use %d for integer, %s for string and %b for byte string (requires 2 arguments: string and length)
306306
* @return @return last error that happened when parsing AT responses
307307
*/
308-
nsapi_error_t at_cmd_discard(const char *cmd, const char* cmd_chr, const char* format = "", ...);
308+
nsapi_error_t at_cmd_discard(const char *cmd, const char *cmd_chr, const char *format = "", ...);
309309

310310
public:
311311

@@ -550,7 +550,7 @@ class ATHandler {
550550

551551
private:
552552
//Handles the arguments from given variadic list
553-
void handle_args(const char* format, va_list list);
553+
void handle_args(const char *format, va_list list);
554554

555555
//Starts an AT command based on given parameters
556556
void handle_start(const char *cmd, const char *cmd_chr);

‎features/cellular/framework/AT/AT_CellularContext.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,6 @@ nsapi_error_t AT_CellularContext::get_rate_control(
757757
CellularContext::RateControlUplinkTimeUnit &timeUnit, int &uplinkRate)
758758
{
759759
_at.lock();
760-
761760
_at.cmd_start_stop("+CGAPNRC", "=", "%d", _cid);
762761

763762
_at.resp_start("+CGAPNRC:");

‎features/cellular/framework/AT/AT_CellularSMS.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ char *AT_CellularSMS::create_pdu(const char *phone_number, const char *message,
394394

395395
nsapi_size_or_error_t AT_CellularSMS::send_sms(const char *phone_number, const char *message, int msg_len)
396396
{
397-
int single_sms_max_length = _use_8bit_encoding ? SMS_MAX_SIZE_8BIT_SINGLE_SMS_SIZE :
397+
int single_sms_max_length = _use_8bit_encoding ?
398+
SMS_MAX_SIZE_8BIT_SINGLE_SMS_SIZE :
398399
SMS_MAX_SIZE_GSM7_SINGLE_SMS_SIZE;
399400
if ((_mode == CellularSMSMmodeText && msg_len > single_sms_max_length) || !phone_number) {
400401
return NSAPI_ERROR_PARAMETER;
@@ -432,7 +433,8 @@ nsapi_size_or_error_t AT_CellularSMS::send_sms(const char *phone_number, const c
432433
// supports uncompressed 8 bit data and GSM 7 bit default alphabet data. Current implementation uses only
433434
// GSM 7 bit default but support is done for 8 bit data.
434435
int sms_count;
435-
int concatenated_sms_length = _use_8bit_encoding ? SMS_MAX_8BIT_CONCATENATED_SINGLE_SMS_SIZE :
436+
int concatenated_sms_length = _use_8bit_encoding ?
437+
SMS_MAX_8BIT_CONCATENATED_SINGLE_SMS_SIZE :
436438
SMS_MAX_GSM7_CONCATENATED_SINGLE_SMS_SIZE;
437439

438440
if (msg_len <= single_sms_max_length) {
@@ -523,7 +525,6 @@ void AT_CellularSMS::set_sms_callback(Callback<void()> func)
523525

524526
nsapi_error_t AT_CellularSMS::set_cpms(const char *memr, const char *memw, const char *mems)
525527
{
526-
527528
return _at.at_cmd_discard("+CPMS", "=", "%s%s%s", memr, memw, mems);
528529
}
529530

‎features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ nsapi_error_t QUECTEL_BG96_CellularContext::do_user_authentication()
7171
{
7272
if (_pwd && _uname) {
7373
if (_at.at_cmd_discard("+QICSGP", "=", "%d%d%s%s%s%d", _cid, 1,
74-
_apn, _uname, _pwd, _authentication_type) != NSAPI_ERROR_OK) {
74+
_apn, _uname, _pwd, _authentication_type) != NSAPI_ERROR_OK) {
7575
return NSAPI_ERROR_AUTH_FAILURE;
7676
}
7777
}

‎features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularStack.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::socket_connect(nsapi_socket_t handle,
5656
_at.lock();
5757
if (socket->proto == NSAPI_TCP) {
5858
_at.at_cmd_discard("+QIOPEN", "=", "%d%d%s%s%d%d%d", _cid, request_connect_id, "TCP",
59-
address.get_ip_address(), address.get_port(), socket->localAddress.get_port(), 0);
59+
address.get_ip_address(), address.get_port(), socket->localAddress.get_port(), 0);
6060

6161
handle_open_socket_response(modem_connect_id, err);
6262

@@ -69,7 +69,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::socket_connect(nsapi_socket_t handle,
6969
_at.at_cmd_discard("+QICLOSE", "=", "%d", modem_connect_id);
7070

7171
_at.at_cmd_discard("+QIOPEN", "=", "%d%d%s%s%d%d%d", _cid, request_connect_id, "TCP",
72-
address.get_ip_address(), address.get_port(), socket->localAddress.get_port(), 0);
72+
address.get_ip_address(), address.get_port(), socket->localAddress.get_port(), 0);
7373

7474
handle_open_socket_response(modem_connect_id, err);
7575
}
@@ -166,8 +166,8 @@ nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *soc
166166

167167
if (socket->proto == NSAPI_UDP && !socket->connected) {
168168
_at.at_cmd_discard("+QIOPEN", "=", "%d%d%s%s%d%d%d", _cid, request_connect_id, "UDP SERVICE",
169-
(_stack_type == IPV4_STACK) ? "127.0.0.1" : "0:0:0:0:0:0:0:1",
170-
remote_port, socket->localAddress.get_port(), 0);
169+
(_stack_type == IPV4_STACK) ? "127.0.0.1" : "0:0:0:0:0:0:0:1",
170+
remote_port, socket->localAddress.get_port(), 0);
171171

172172
handle_open_socket_response(modem_connect_id, err);
173173

@@ -179,14 +179,14 @@ nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *soc
179179
socket_close_impl(modem_connect_id);
180180

181181
_at.at_cmd_discard("+QIOPEN", "=", "%d%d%s%s%d%d%d", _cid, request_connect_id, "UDP SERVICE",
182-
(_stack_type == IPV4_STACK) ? "127.0.0.1" : "0:0:0:0:0:0:0:1",
183-
remote_port, socket->localAddress.get_port(), 0);
182+
(_stack_type == IPV4_STACK) ? "127.0.0.1" : "0:0:0:0:0:0:0:1",
183+
remote_port, socket->localAddress.get_port(), 0);
184184

185185
handle_open_socket_response(modem_connect_id, err);
186186
}
187187
} else if (socket->proto == NSAPI_UDP && socket->connected) {
188188
_at.at_cmd_discard("+QIOPEN", "=", "%d%d%s%s%d", _cid, request_connect_id, "UDP",
189-
socket->remoteAddress.get_ip_address(), socket->remoteAddress.get_port());
189+
socket->remoteAddress.get_ip_address(), socket->remoteAddress.get_port());
190190

191191
handle_open_socket_response(modem_connect_id, err);
192192

@@ -198,7 +198,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *soc
198198
socket_close_impl(modem_connect_id);
199199

200200
_at.at_cmd_discard("+QIOPEN", "=", "%d%d%s%s%d", _cid, request_connect_id, "UDP",
201-
socket->remoteAddress.get_ip_address(), socket->remoteAddress.get_port());
201+
socket->remoteAddress.get_ip_address(), socket->remoteAddress.get_port());
202202

203203
handle_open_socket_response(modem_connect_id, err);
204204
}
@@ -235,7 +235,7 @@ nsapi_size_or_error_t QUECTEL_BG96_CellularStack::socket_sendto_impl(CellularSoc
235235
// Send
236236
if (socket->proto == NSAPI_UDP) {
237237
_at.cmd_start_stop("+QISEND", "=", "%d%d%s%d", socket->id, size,
238-
address.get_ip_address(), address.get_port());
238+
address.get_ip_address(), address.get_port());
239239
} else {
240240
_at.cmd_start_stop("+QISEND", "=", "%d%d", socket->id, size);
241241
}

0 commit comments

Comments
 (0)