Skip to content

Commit ffcb6ec

Browse files
0xc01700xc0170
committed
platform: astyle update
1 parent 483427a commit ffcb6ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2785
-2025
lines changed

‎platform/ATCmdParser.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void ATCmdParser::flush()
7979
int ATCmdParser::write(const char *data, int size)
8080
{
8181
int i = 0;
82-
for ( ; i < size; i++) {
82+
for (; i < size; i++) {
8383
if (putc(data[i]) < 0) {
8484
return -1;
8585
}
@@ -90,7 +90,7 @@ int ATCmdParser::write(const char *data, int size)
9090
int ATCmdParser::read(char *data, int size)
9191
{
9292
int i = 0;
93-
for ( ; i < size; i++) {
93+
for (; i < size; i++) {
9494
int c = getc();
9595
if (c < 0) {
9696
return -1;
@@ -110,7 +110,7 @@ int ATCmdParser::vprintf(const char *format, va_list args)
110110
}
111111

112112
int i = 0;
113-
for ( ; _buffer[i]; i++) {
113+
for (; _buffer[i]; i++) {
114114
if (putc(_buffer[i]) < 0) {
115115
return -1;
116116
}
@@ -128,7 +128,7 @@ int ATCmdParser::vscanf(const char *format, va_list args)
128128
int offset = 0;
129129

130130
while (format[i]) {
131-
if (format[i] == '%' && format[i+1] != '%' && format[i+1] != '*') {
131+
if (format[i] == '%' && format[i + 1] != '%' && format[i + 1] != '*') {
132132
_buffer[offset++] = '%';
133133
_buffer[offset++] = '*';
134134
i++;
@@ -155,7 +155,7 @@ int ATCmdParser::vscanf(const char *format, va_list args)
155155

156156
while (true) {
157157
// Ran out of space
158-
if (j+1 >= _buffer_size - offset) {
158+
if (j + 1 >= _buffer_size - offset) {
159159
return false;
160160
}
161161
// Receive next character
@@ -168,12 +168,12 @@ int ATCmdParser::vscanf(const char *format, va_list args)
168168

169169
// Check for match
170170
int count = -1;
171-
sscanf(_buffer+offset, _buffer, &count);
171+
sscanf(_buffer + offset, _buffer, &count);
172172

173173
// We only succeed if all characters in the response are matched
174174
if (count == j) {
175175
// Store the found results
176-
vsscanf(_buffer+offset, format, args);
176+
vsscanf(_buffer + offset, format, args);
177177
return j;
178178
}
179179
}
@@ -220,14 +220,14 @@ bool ATCmdParser::vrecv(const char *response, va_list args)
220220
bool whole_line_wanted = false;
221221

222222
while (response[i]) {
223-
if (response[i] == '%' && response[i+1] != '%' && response[i+1] != '*') {
223+
if (response[i] == '%' && response[i + 1] != '%' && response[i + 1] != '*') {
224224
_buffer[offset++] = '%';
225225
_buffer[offset++] = '*';
226226
i++;
227227
} else {
228228
_buffer[offset++] = response[i++];
229229
// Find linebreaks, taking care not to be fooled if they're in a %[^\n] conversion specification
230-
if (response[i - 1] == '\n' && !(i >= 3 && response[i-3] == '[' && response[i-2] == '^')) {
230+
if (response[i - 1] == '\n' && !(i >= 3 && response[i - 3] == '[' && response[i - 2] == '^')) {
231231
whole_line_wanted = true;
232232
break;
233233
}
@@ -260,7 +260,7 @@ bool ATCmdParser::vrecv(const char *response, va_list args)
260260
}
261261
// Simplify newlines (borrowed from retarget.cpp)
262262
if ((c == CR && _in_prev != LF) ||
263-
(c == LF && _in_prev != CR)) {
263+
(c == LF && _in_prev != CR)) {
264264
_in_prev = c;
265265
c = '\n';
266266
} else if ((c == CR && _in_prev == LF) ||
@@ -277,7 +277,7 @@ bool ATCmdParser::vrecv(const char *response, va_list args)
277277
// Check for oob data
278278
for (struct oob *oob = _oobs; oob; oob = oob->next) {
279279
if ((unsigned)j == oob->len && memcmp(
280-
oob->prefix, _buffer+offset, oob->len) == 0) {
280+
oob->prefix, _buffer + offset, oob->len) == 0) {
281281
debug_if(_dbg_on, "AT! %s\n", oob->prefix);
282282
oob->cb();
283283

@@ -298,18 +298,18 @@ bool ATCmdParser::vrecv(const char *response, va_list args)
298298
// This allows recv("Foo: %s\n") to work, and not match with just the first character of a string
299299
// (scanf does not itself match whitespace in its format string, so \n is not significant to it)
300300
} else {
301-
sscanf(_buffer+offset, _buffer, &count);
301+
sscanf(_buffer + offset, _buffer, &count);
302302
}
303303

304304
// We only succeed if all characters in the response are matched
305305
if (count == j) {
306-
debug_if(_dbg_on, "AT= %s\n", _buffer+offset);
306+
debug_if(_dbg_on, "AT= %s\n", _buffer + offset);
307307
// Reuse the front end of the buffer
308308
memcpy(_buffer, response, i);
309309
_buffer[i] = 0;
310310

311311
// Store the found results
312-
vsscanf(_buffer+offset, _buffer, args);
312+
vsscanf(_buffer + offset, _buffer, args);
313313

314314
// Jump to next line and continue parsing
315315
response += i;
@@ -318,8 +318,8 @@ bool ATCmdParser::vrecv(const char *response, va_list args)
318318

319319
// Clear the buffer when we hit a newline or ran out of space
320320
// running out of space usually means we ran into binary data
321-
if (c == '\n' || j+1 >= _buffer_size - offset) {
322-
debug_if(_dbg_on, "AT< %s", _buffer+offset);
321+
if (c == '\n' || j + 1 >= _buffer_size - offset) {
322+
debug_if(_dbg_on, "AT< %s", _buffer + offset);
323323
j = 0;
324324
}
325325
}
@@ -396,7 +396,7 @@ bool ATCmdParser::process_oob()
396396
}
397397
// Simplify newlines (borrowed from retarget.cpp)
398398
if ((c == CR && _in_prev != LF) ||
399-
(c == LF && _in_prev != CR)) {
399+
(c == LF && _in_prev != CR)) {
400400
_in_prev = c;
401401
c = '\n';
402402
} else if ((c == CR && _in_prev == LF) ||
@@ -414,17 +414,17 @@ bool ATCmdParser::process_oob()
414414
struct oob *oob = _oobs;
415415
while (oob) {
416416
if (i == (int)oob->len && memcmp(
417-
oob->prefix, _buffer, oob->len) == 0) {
417+
oob->prefix, _buffer, oob->len) == 0) {
418418
debug_if(_dbg_on, "AT! %s\r\n", oob->prefix);
419419
oob->cb();
420420
return true;
421421
}
422422
oob = oob->next;
423423
}
424-
424+
425425
// Clear the buffer when we hit a newline or ran out of space
426426
// running out of space usually means we ran into binary data
427-
if (((i+1) >= _buffer_size) || (c == '\n')) {
427+
if (((i + 1) >= _buffer_size) || (c == '\n')) {
428428
debug_if(_dbg_on, "AT< %s", _buffer);
429429
i = 0;
430430
}

‎platform/ATCmdParser.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ namespace mbed {
5252
* @endcode
5353
*/
5454

55-
class ATCmdParser : private NonCopyable<ATCmdParser>
56-
{
55+
class ATCmdParser : private NonCopyable<ATCmdParser> {
5756
private:
5857
// File handle
5958
// Not owned by ATCmdParser
@@ -90,8 +89,8 @@ class ATCmdParser : private NonCopyable<ATCmdParser>
9089
* @param debug turns on/off debug output for AT commands
9190
*/
9291
ATCmdParser(FileHandle *fh, const char *output_delimiter = "\r",
93-
int buffer_size = 256, int timeout = 8000, bool debug = false)
94-
: _fh(fh), _buffer_size(buffer_size), _in_prev(0), _oobs(NULL)
92+
int buffer_size = 256, int timeout = 8000, bool debug = false)
93+
: _fh(fh), _buffer_size(buffer_size), _in_prev(0), _oobs(NULL)
9594
{
9695
_buffer = new char[buffer_size];
9796
set_timeout(timeout);
@@ -198,7 +197,7 @@ class ATCmdParser : private NonCopyable<ATCmdParser>
198197
* @param ... all printf-like arguments to insert into command
199198
* @return true only if command is successfully sent
200199
*/
201-
bool send(const char *command, ...) MBED_PRINTF_METHOD(1,2);
200+
bool send(const char *command, ...) MBED_PRINTF_METHOD(1, 2);
202201

203202
bool vsend(const char *command, va_list args);
204203

@@ -216,7 +215,7 @@ class ATCmdParser : private NonCopyable<ATCmdParser>
216215
* @param ... all scanf-like arguments to extract from response
217216
* @return true only if response is successfully matched
218217
*/
219-
bool recv(const char *response, ...) MBED_SCANF_METHOD(1,2);
218+
bool recv(const char *response, ...) MBED_SCANF_METHOD(1, 2);
220219

221220
bool vrecv(const char *response, va_list args);
222221

@@ -261,7 +260,7 @@ class ATCmdParser : private NonCopyable<ATCmdParser>
261260
* @param ... arguments to printf
262261
* @return number of bytes written or -1 on failure
263262
*/
264-
int printf(const char *format, ...) MBED_PRINTF_METHOD(1,2);
263+
int printf(const char *format, ...) MBED_PRINTF_METHOD(1, 2);
265264

266265
int vprintf(const char *format, va_list args);
267266

@@ -273,7 +272,7 @@ class ATCmdParser : private NonCopyable<ATCmdParser>
273272
* @param ... arguments to scanf
274273
* @return number of bytes read or -1 on failure
275274
*/
276-
int scanf(const char *format, ...) MBED_SCANF_METHOD(1,2);
275+
int scanf(const char *format, ...) MBED_SCANF_METHOD(1, 2);
277276

278277
int vscanf(const char *format, va_list args);
279278

@@ -298,7 +297,7 @@ class ATCmdParser : private NonCopyable<ATCmdParser>
298297
* recv operation.
299298
*/
300299
void abort();
301-
300+
302301
/**
303302
* Process out-of-band data
304303
*

0 commit comments

Comments
 (0)