astyle update to new files

0xc0170 · 0xc0170 · commit ef9dbc5bbb81 · 2018-03-15T08:51:52.000Z
diff --git a/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp b/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
@@ -50,7 +50,7 @@ class SysTimerTest: public rtos::internal::SysTimer {
 
 public:
     SysTimerTest() :
-            SysTimer(), _sem(0, 1)
+        SysTimer(), _sem(0, 1)
     {
     }
 
diff --git a/drivers/MbedCRC.cpp b/drivers/MbedCRC.cpp
@@ -26,46 +26,46 @@ namespace mbed {
 */
 template <uint32_t polynomial, uint8_t width>
 MbedCRC<polynomial, width>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):
-        _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder), _crc_table(NULL)
+    _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder), _crc_table(NULL)
 {
     mbed_crc_ctor();
 }
 
 template<>
 MbedCRC<POLY_32BIT_ANSI, 32>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):
-        _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
-        _crc_table((uint32_t *)Table_CRC_32bit_ANSI)
+    _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
+    _crc_table((uint32_t *)Table_CRC_32bit_ANSI)
 {
     mbed_crc_ctor();
 }
 
 template<>
 MbedCRC<POLY_8BIT_CCITT, 8>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):
-        _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
-        _crc_table((uint32_t *)Table_CRC_8bit_CCITT)
+    _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
+    _crc_table((uint32_t *)Table_CRC_8bit_CCITT)
 {
     mbed_crc_ctor();
 }
 
 template<>
 MbedCRC<POLY_7BIT_SD, 7>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):
-        _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
-        _crc_table((uint32_t *)Table_CRC_7Bit_SD)
+    _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
+    _crc_table((uint32_t *)Table_CRC_7Bit_SD)
 {
     mbed_crc_ctor();
 }
 
 template<>
 MbedCRC<POLY_16BIT_CCITT, 16>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):
-        _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
-        _crc_table((uint32_t *)Table_CRC_16bit_CCITT)
+    _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
+    _crc_table((uint32_t *)Table_CRC_16bit_CCITT)
 {
 }
 
 template<>
 MbedCRC<POLY_16BIT_IBM, 16>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):
-        _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
-        _crc_table((uint32_t *)Table_CRC_16bit_IBM)
+    _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),
+    _crc_table((uint32_t *)Table_CRC_16bit_IBM)
 {
     mbed_crc_ctor();
 }
diff --git a/drivers/MbedCRC.h b/drivers/MbedCRC.h
@@ -103,9 +103,8 @@ typedef enum crc_polynomial {
  * @ingroup drivers
  */
 
-template <uint32_t polynomial=POLY_32BIT_ANSI, uint8_t width=32>
-class MbedCRC
-{
+template <uint32_t polynomial = POLY_32BIT_ANSI, uint8_t width = 32>
+class MbedCRC {
 public:
     typedef uint64_t crc_data_size_t;
 
@@ -115,7 +114,7 @@ class MbedCRC
      *  @param  final_xor  Final Xor value
      *  @param  reflect_data
      *  @param  reflect_remainder
-*  @note   Default constructor without any arguments is valid only for supported CRC polynomials. :: crc_polynomial_t
+    *  @note   Default constructor without any arguments is valid only for supported CRC polynomials. :: crc_polynomial_t
      *          MbedCRC <POLY_7BIT_SD, 7> ct; --- Valid POLY_7BIT_SD
      *          MbedCRC <0x1021, 16> ct; --- Valid POLY_16BIT_CCITT
      *          MbedCRC <POLY_16BIT_CCITT, 32> ct; --- Invalid, compilation error
@@ -301,7 +300,7 @@ class MbedCRC
      */
     uint32_t reflect_bytes(uint32_t data) const
     {
-        if(_reflect_data) {
+        if (_reflect_data) {
             uint32_t reflection = 0x0;
 
             for (uint8_t bit = 0; bit < 8; ++bit) {
@@ -337,7 +336,7 @@ class MbedCRC
                 data_byte = reflect_bytes(data[byte]);
                 for (uint8_t bit = 8; bit > 0; --bit) {
                     p_crc <<= 1;
-                    if (( data_byte ^ p_crc) & get_top_bit()) {
+                    if ((data_byte ^ p_crc) & get_top_bit()) {
                         p_crc ^= polynomial;
                     }
                     data_byte <<= 1;
@@ -361,13 +360,13 @@ class MbedCRC
         return 0;
     }
 
-     /** CRC computation using ROM tables
-     *
-     * @param  buffer  data buffer
-     * @param  size  size of the data
-     * @param  crc  CRC value is filled in, but the value is not the final
-     * @return  0  on success or a negative error code on failure
-     */
+    /** CRC computation using ROM tables
+    *
+    * @param  buffer  data buffer
+    * @param  size  size of the data
+    * @param  crc  CRC value is filled in, but the value is not the final
+    * @return  0  on success or a negative error code on failure
+    */
     int32_t table_compute_partial(const void *buffer, crc_data_size_t size, uint32_t *crc) const
     {
         MBED_ASSERT(crc != NULL);
diff --git a/features/cellular/TESTS/cellular/cellular_all/network.cpp b/features/cellular/TESTS/cellular/cellular_all/network.cpp
@@ -71,7 +71,7 @@ static bool wait_register()
 
 void test_attach()
 {
-    cellularDevice.set_timeout(120*1000); // 120 second timeout for at commands after power is up. It might take time to register, attach and connect
+    cellularDevice.set_timeout(120 * 1000); // 120 second timeout for at commands after power is up. It might take time to register, attach and connect
     tr_info("Register to network.");
     TEST_ASSERT(wait_register());
     tr_info("Attach to network.");
diff --git a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp b/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp
@@ -502,7 +502,7 @@ nsapi_error_t PPPCellularInterface::setup_context_and_credentials()
 }
 
 void  PPPCellularInterface::set_credentials(const char *apn, const char *uname,
-                                            const char *pwd)
+        const char *pwd)
 {
     _apn = apn;
     _uname = uname;
@@ -573,7 +573,7 @@ nsapi_error_t PPPCellularInterface::connect()
         user_specified_apn = true;
 #endif
     }
-    
+
     if (is_connected()) {
         return NSAPI_ERROR_IS_CONNECTED;
     } else if (_connect_status == NSAPI_STATUS_CONNECTING) {
@@ -681,7 +681,7 @@ nsapi_error_t PPPCellularInterface::connect()
         }
 
         tr_info("The APN being used is %s.\n", _apn);
-        
+
         /* Attempt to enter data mode */
         success = set_atd(_at); //enter into Data mode with the modem
         if (!success) {
diff --git a/hal/mbed_sleep_manager.c b/hal/mbed_sleep_manager.c
@@ -42,7 +42,7 @@ typedef struct sleep_statistic {
 
 static sleep_statistic_t sleep_stats[STATISTIC_COUNT];
 
-static const char* strip_path(const char* const filename)
+static const char *strip_path(const char *const filename)
 {
     char *output = strrchr(filename, '/');
 
@@ -59,7 +59,7 @@ static const char* strip_path(const char* const filename)
     return filename;
 }
 
-static sleep_statistic_t* sleep_tracker_find(const char *const filename)
+static sleep_statistic_t *sleep_tracker_find(const char *const filename)
 {
     char temp[IDENTIFIER_WIDTH];
     strncpy(temp, filename, IDENTIFIER_WIDTH);
@@ -75,7 +75,7 @@ static sleep_statistic_t* sleep_tracker_find(const char *const filename)
     return NULL;
 }
 
-static sleep_statistic_t* sleep_tracker_add(const char* const filename)
+static sleep_statistic_t *sleep_tracker_add(const char *const filename)
 {
     char temp[IDENTIFIER_WIDTH];
     strncpy(temp, filename, IDENTIFIER_WIDTH);
@@ -109,15 +109,15 @@ static void sleep_tracker_print_stats(void)
         }
 
         debug("[id: %s, count: %u]\r\n", sleep_stats[i].identifier,
-                                          sleep_stats[i].count);
+              sleep_stats[i].count);
     }
 }
 
-void sleep_tracker_lock(const char* const filename, int line)
+void sleep_tracker_lock(const char *const filename, int line)
 {
-    const char* const stripped_path = strip_path(filename);
+    const char *const stripped_path = strip_path(filename);
 
-    sleep_statistic_t* stat = sleep_tracker_find(stripped_path);
+    sleep_statistic_t *stat = sleep_tracker_find(stripped_path);
 
     // Entry for this driver does not exist, create one.
     if (stat == NULL) {
@@ -129,10 +129,10 @@ void sleep_tracker_lock(const char* const filename, int line)
     debug("LOCK: %s, ln: %i, lock count: %u\r\n", stripped_path, line, deep_sleep_lock);
 }
 
-void sleep_tracker_unlock(const char* const filename, int line)
+void sleep_tracker_unlock(const char *const filename, int line)
 {
-    const char* const stripped_path = strip_path(filename);
-    sleep_statistic_t* stat = sleep_tracker_find(stripped_path);
+    const char *const stripped_path = strip_path(filename);
+    sleep_statistic_t *stat = sleep_tracker_find(stripped_path);
 
     // Entry for this driver does not exist, something went wrong.
     if (stat == NULL) {
diff --git a/platform/mbed_interface.c b/platform/mbed_interface.c
@@ -79,7 +79,7 @@ int mbed_interface_powerdown(void)
 }
 
 MBED_DEPRECATED_SINCE("mbed-os-5.9", "This function shouldn't be used in new code."
-    "For system reset funcionality use system_reset()")
+                      "For system reset funcionality use system_reset()")
 void mbed_reset(void)
 {
     mbed_interface_reset();

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class SysTimerTest: public rtos::internal::SysTimer {`
`50`	`50`
`51`	`51`	`public:`
`52`	`52`	`SysTimerTest() :`
`53`		`- SysTimer(), _sem(0, 1)`
	`53`	`+ SysTimer(), _sem(0, 1)`
`54`	`54`	`{`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -26,46 +26,46 @@ namespace mbed {`
`26`	`26`	`*/`
`27`	`27`	`template <uint32_t polynomial, uint8_t width>`
`28`	`28`	`MbedCRC<polynomial, width>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):`
`29`		`- _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder), _crc_table(NULL)`
	`29`	`+ _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder), _crc_table(NULL)`
`30`	`30`	`{`
`31`	`31`	`mbed_crc_ctor();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`template<>`
`35`	`35`	`MbedCRC<POLY_32BIT_ANSI, 32>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):`
`36`		`- _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
`37`		`- _crc_table((uint32_t *)Table_CRC_32bit_ANSI)`
	`36`	`+ _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
	`37`	`+ _crc_table((uint32_t *)Table_CRC_32bit_ANSI)`
`38`	`38`	`{`
`39`	`39`	`mbed_crc_ctor();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`template<>`
`43`	`43`	`MbedCRC<POLY_8BIT_CCITT, 8>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):`
`44`		`- _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
`45`		`- _crc_table((uint32_t *)Table_CRC_8bit_CCITT)`
	`44`	`+ _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
	`45`	`+ _crc_table((uint32_t *)Table_CRC_8bit_CCITT)`
`46`	`46`	`{`
`47`	`47`	`mbed_crc_ctor();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`template<>`
`51`	`51`	`MbedCRC<POLY_7BIT_SD, 7>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):`
`52`		`- _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
`53`		`- _crc_table((uint32_t *)Table_CRC_7Bit_SD)`
	`52`	`+ _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
	`53`	`+ _crc_table((uint32_t *)Table_CRC_7Bit_SD)`
`54`	`54`	`{`
`55`	`55`	`mbed_crc_ctor();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`template<>`
`59`	`59`	`MbedCRC<POLY_16BIT_CCITT, 16>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):`
`60`		`- _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
`61`		`- _crc_table((uint32_t *)Table_CRC_16bit_CCITT)`
	`60`	`+ _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
	`61`	`+ _crc_table((uint32_t *)Table_CRC_16bit_CCITT)`
`62`	`62`	`{`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`template<>`
`66`	`66`	`MbedCRC<POLY_16BIT_IBM, 16>::MbedCRC(uint32_t initial_xor, uint32_t final_xor, bool reflect_data, bool reflect_remainder):`
`67`		`- _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
`68`		`- _crc_table((uint32_t *)Table_CRC_16bit_IBM)`
	`67`	`+ _initial_value(initial_xor), _final_xor(final_xor), _reflect_data(reflect_data), _reflect_remainder(reflect_remainder),`
	`68`	`+ _crc_table((uint32_t *)Table_CRC_16bit_IBM)`
`69`	`69`	`{`
`70`	`70`	`mbed_crc_ctor();`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static bool wait_register()`
`71`	`71`
`72`	`72`	`void test_attach()`
`73`	`73`	`{`
`74`		`- cellularDevice.set_timeout(120*1000); // 120 second timeout for at commands after power is up. It might take time to register, attach and connect`
	`74`	`+ cellularDevice.set_timeout(120 * 1000); // 120 second timeout for at commands after power is up. It might take time to register, attach and connect`
`75`	`75`	`tr_info("Register to network.");`
`76`	`76`	`TEST_ASSERT(wait_register());`
`77`	`77`	`tr_info("Attach to network.");`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ nsapi_error_t PPPCellularInterface::setup_context_and_credentials()`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`void PPPCellularInterface::set_credentials(const char apn, const char uname,`
`505`		`- const char *pwd)`
	`505`	`+ const char *pwd)`
`506`	`506`	`{`
`507`	`507`	`_apn = apn;`
`508`	`508`	`_uname = uname;`
`@@ -573,7 +573,7 @@ nsapi_error_t PPPCellularInterface::connect()`
`573`	`573`	`user_specified_apn = true;`
`574`	`574`	`#endif`
`575`	`575`	`}`
`576`		`-`
	`576`	`+`
`577`	`577`	`if (is_connected()) {`
`578`	`578`	`return NSAPI_ERROR_IS_CONNECTED;`
`579`	`579`	`} else if (_connect_status == NSAPI_STATUS_CONNECTING) {`
`@@ -681,7 +681,7 @@ nsapi_error_t PPPCellularInterface::connect()`
`681`	`681`	`}`
`682`	`682`
`683`	`683`	`tr_info("The APN being used is %s.\n", _apn);`
`684`		`-`
	`684`	`+`
`685`	`685`	`/* Attempt to enter data mode */`
`686`	`686`	`success = set_atd(_at); //enter into Data mode with the modem`
`687`	`687`	`if (!success) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ typedef struct sleep_statistic {`
`42`	`42`
`43`	`43`	`static sleep_statistic_t sleep_stats[STATISTIC_COUNT];`
`44`	`44`
`45`		`-static const char* strip_path(const char* const filename)`
	`45`	`+static const char strip_path(const char const filename)`
`46`	`46`	`{`
`47`	`47`	`char *output = strrchr(filename, '/');`
`48`	`48`
`@@ -59,7 +59,7 @@ static const char* strip_path(const char* const filename)`
`59`	`59`	`return filename;`
`60`	`60`	`}`
`61`	`61`
`62`		`-static sleep_statistic_t* sleep_tracker_find(const char *const filename)`
	`62`	`+static sleep_statistic_t sleep_tracker_find(const char const filename)`
`63`	`63`	`{`
`64`	`64`	`char temp[IDENTIFIER_WIDTH];`
`65`	`65`	`strncpy(temp, filename, IDENTIFIER_WIDTH);`
`@@ -75,7 +75,7 @@ static sleep_statistic_t* sleep_tracker_find(const char *const filename)`
`75`	`75`	`return NULL;`
`76`	`76`	`}`
`77`	`77`
`78`		`-static sleep_statistic_t* sleep_tracker_add(const char* const filename)`
	`78`	`+static sleep_statistic_t sleep_tracker_add(const char const filename)`
`79`	`79`	`{`
`80`	`80`	`char temp[IDENTIFIER_WIDTH];`
`81`	`81`	`strncpy(temp, filename, IDENTIFIER_WIDTH);`
`@@ -109,15 +109,15 @@ static void sleep_tracker_print_stats(void)`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`debug("[id: %s, count: %u]\r\n", sleep_stats[i].identifier,`
`112`		`- sleep_stats[i].count);`
	`112`	`+ sleep_stats[i].count);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`-void sleep_tracker_lock(const char* const filename, int line)`
	`116`	`+void sleep_tracker_lock(const char *const filename, int line)`
`117`	`117`	`{`
`118`		`- const char* const stripped_path = strip_path(filename);`
	`118`	`+ const char *const stripped_path = strip_path(filename);`
`119`	`119`
`120`		`- sleep_statistic_t* stat = sleep_tracker_find(stripped_path);`
	`120`	`+ sleep_statistic_t *stat = sleep_tracker_find(stripped_path);`
`121`	`121`
`122`	`122`	`// Entry for this driver does not exist, create one.`
`123`	`123`	`if (stat == NULL) {`
`@@ -129,10 +129,10 @@ void sleep_tracker_lock(const char* const filename, int line)`
`129`	`129`	`debug("LOCK: %s, ln: %i, lock count: %u\r\n", stripped_path, line, deep_sleep_lock);`
`130`	`130`	`}`
`131`	`131`
`132`		`-void sleep_tracker_unlock(const char* const filename, int line)`
	`132`	`+void sleep_tracker_unlock(const char *const filename, int line)`
`133`	`133`	`{`
`134`		`- const char* const stripped_path = strip_path(filename);`
`135`		`- sleep_statistic_t* stat = sleep_tracker_find(stripped_path);`
	`134`	`+ const char *const stripped_path = strip_path(filename);`
	`135`	`+ sleep_statistic_t *stat = sleep_tracker_find(stripped_path);`
`136`	`136`
`137`	`137`	`// Entry for this driver does not exist, something went wrong.`
`138`	`138`	`if (stat == NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ int mbed_interface_powerdown(void)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`MBED_DEPRECATED_SINCE("mbed-os-5.9", "This function shouldn't be used in new code."`
`82`		`- "For system reset funcionality use system_reset()")`
	`82`	`+ "For system reset funcionality use system_reset()")`
`83`	`83`	`void mbed_reset(void)`
`84`	`84`	`{`
`85`	`85`	`mbed_interface_reset();`