Merge pull request #8244 from 0xc0170/fix_components_astyle

Cruz Monrreal · web-flow · commit 395ea063c1ab · 2018-10-25T10:11:14.000-05:00
storage: fix component coding style
diff --git a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
@@ -131,11 +131,11 @@ enum dummy {
 };
 
 DataFlashBlockDevice::DataFlashBlockDevice(PinName mosi,
-        PinName miso,
-        PinName sclk,
-        PinName cs,
-        int freq,
-        PinName nwp)
+                                           PinName miso,
+                                           PinName sclk,
+                                           PinName cs,
+                                           int freq,
+                                           PinName nwp)
     :   _spi(mosi, miso, sclk),
         _cs(cs, 1),
         _nwp(nwp),
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/filesystem/fopen/fopen.cpp b/components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/filesystem/fopen/fopen.cpp
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_test.c b/components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_test.c
@@ -61,7 +61,7 @@ const uint8_t fslittle_test_byte_data_table[FSLITTLE_TEST_BYTE_DATA_TABLE_SIZE]
 
 /* @brief  test utility function to delete the file identified by filename
  */
-int32_t fslittle_test_delete(const char* filename)
+int32_t fslittle_test_delete(const char *filename)
 {
     FSLITTLE_FENTRYLOG("%s:entered.\r\n", __func__);
     return remove(filename);
@@ -74,18 +74,18 @@ int32_t fslittle_test_delete(const char* filename)
  * @param   data        data to store in file
  * @param   len         number of bytes of data present in the data buffer.
  */
-int32_t fslittle_test_create(const char* filename, const char* data, size_t len)
+int32_t fslittle_test_create(const char *filename, const char *data, size_t len)
 {
     int32_t ret = -1;
     FILE *fp = NULL;
 
     FSLITTLE_FENTRYLOG("%s:entered (filename=%s, len=%d).\n", __func__, filename, (int) len);
     fp = fopen(filename, "w+");
-    if(fp == NULL){
+    if (fp == NULL) {
         return ret;
     }
-    ret = fwrite((const void*) data, len, 1, fp);
-    if(ret < 0){
+    ret = fwrite((const void *) data, len, 1, fp);
+    if (ret < 0) {
         fclose(fp);
         return ret;
     }
@@ -99,16 +99,15 @@ int32_t fslittle_test_create(const char* filename, const char* data, size_t len)
  * @param   len     length of kv name to generate
  *
  */
-int32_t fslittle_test_filename_gen(char* name, const size_t len)
+int32_t fslittle_test_filename_gen(char *name, const size_t len)
 {
     size_t i;
     uint32_t pos = 0;
 
-    const char* buf = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!$-_@";
+    const char *buf = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!$-_@";
     const int buf_len = strlen(buf);
     FSLITTLE_FENTRYLOG("%s:entered\n", __func__);
-    for(i = 0; i < len; i++)
-    {
+    for (i = 0; i < len; i++) {
         pos = rand() % (buf_len);
         name[i] = buf[pos];
     }
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
@@ -171,7 +171,7 @@ void dir_file_check(char *list[], uint32_t elements)
                     TEST_ASSERT(1);
                 }
                 break;
-            } else if ( i == elements) {
+            } else if (i == elements) {
                 TEST_ASSERT_EQUAL(0, res);
             }
         }
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
@@ -294,7 +294,7 @@ void test_dir_check()
                         TEST_ASSERT(1);
                     }
                     break;
-                } else if ( i == numFiles) {
+                } else if (i == numFiles) {
                     TEST_ASSERT_EQUAL(0, res);
                 }
             }
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
@@ -65,7 +65,7 @@ using namespace utest::v1;
  *        "DEVICE_SPI": 1,
  *        "FSFAT_SDCARD_INSTALLED": 1
  *      },
- *  	<<< lines removed >>>
+ *      <<< lines removed >>>
  */
 
 #if defined(DEVICE_SPI) && ( defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) || (MBED_CONF_SD_FSFAT_SDCARD_INSTALLED))
@@ -155,7 +155,7 @@ static int32_t fsfat_filepath_split(char *filepath, char *parts[], uint32_t num)
     char *z = filepath;
 
     while (i < num && *z != '\0') {
-        if (*z == '/' ) {
+        if (*z == '/') {
             *z = '\0';
             parts[i] = ++z;
             i++;
@@ -200,7 +200,7 @@ int32_t fsfat_filepath_remove_all(char *filepath)
     while (pos != fpathbuf) {
         /* If the remaining file path is the mount point path then finish as the mount point cannot be removed */
         if (strlen(fpathbuf) == strlen(FSFAT_FOPEN_TEST_MOUNT_PT_PATH)) {
-            if ( strncmp(fpathbuf, FSFAT_FOPEN_TEST_MOUNT_PT_PATH, strlen(fpathbuf)) == 0) {
+            if (strncmp(fpathbuf, FSFAT_FOPEN_TEST_MOUNT_PT_PATH, strlen(fpathbuf)) == 0) {
                 break;
             }
         }
@@ -621,7 +621,7 @@ control_t fsfat_fopen_test_05(const size_t call_count)
     while (node->code !=  fsfat_fopen_kv_name_ascii_table_code_sentinel_g) {
         /* loop over range */
         for (j = node->code; j < (node + 1)->code; j++) {
-            if ( (j >= 48 && j <= 57) || (j >= 65 && j <= 90) || (j >= 97 && j <= 122)) {
+            if ((j >= 48 && j <= 57) || (j >= 65 && j <= 90) || (j >= 97 && j <= 122)) {
                 FSFAT_DBGLOG("%s: skipping alpha-numeric ascii character code %d (%c).\n", __func__, (int) j, (char) j);
                 continue;
             }
@@ -775,10 +775,10 @@ control_t fsfat_fopen_test_06(const size_t call_count)
 
 /** @brief  test for errno reporting on a failed fopen()call
  *
- *	This test does the following:
- *	- tries to open a file that does not exist for reading, and checks that a NULL pointer is returned.
- *	- checks that errno is not 0 as there is an error.
- *	- checks that ferror() returns 1 indicating an error exists.
+ *  This test does the following:
+ *  - tries to open a file that does not exist for reading, and checks that a NULL pointer is returned.
+ *  - checks that errno is not 0 as there is an error.
+ *  - checks that ferror() returns 1 indicating an error exists.
  *
  * Note: see NOTE_1 below.
  *
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
@@ -97,7 +97,7 @@ void test_file_tests()
     TEST_ASSERT_EQUAL(0, res);
 }
 
-void write_file_data (char count)
+void write_file_data(char count)
 {
 
     char filename[10];
@@ -125,7 +125,7 @@ void write_file_data (char count)
     TEST_ASSERT_EQUAL(0, res);
 }
 
-void read_file_data (char count)
+void read_file_data(char count)
 {
     char filename[10];
     uint8_t rbuffer[MBED_TEST_BUFFER];
diff --git a/components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.c b/components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.c
@@ -61,7 +61,7 @@ const uint8_t fsfat_test_byte_data_table[FSFAT_TEST_BYTE_DATA_TABLE_SIZE] = {
 
 /* @brief  test utility function to delete the file identified by filename
  */
-int32_t fsfat_test_delete(const char* filename)
+int32_t fsfat_test_delete(const char *filename)
 {
     FSFAT_FENTRYLOG("%s:entered.\r\n", __func__);
     return remove(filename);
@@ -74,18 +74,18 @@ int32_t fsfat_test_delete(const char* filename)
  * @param   data        data to store in file
  * @param   len         number of bytes of data present in the data buffer.
  */
-int32_t fsfat_test_create(const char* filename, const char* data, size_t len)
+int32_t fsfat_test_create(const char *filename, const char *data, size_t len)
 {
     int32_t ret = -1;
     FILE *fp = NULL;
 
     FSFAT_FENTRYLOG("%s:entered (filename=%s, len=%d).\n", __func__, filename, (int) len);
     fp = fopen(filename, "w+");
-    if(fp == NULL){
+    if (fp == NULL) {
         return ret;
     }
-    ret = fwrite((const void*) data, len, 1, fp);
-    if(ret < 0){
+    ret = fwrite((const void *) data, len, 1, fp);
+    if (ret < 0) {
         fclose(fp);
         return ret;
     }
@@ -99,16 +99,15 @@ int32_t fsfat_test_create(const char* filename, const char* data, size_t len)
  * @param   len     length of kv name to generate
  *
  */
-int32_t fsfat_test_filename_gen(char* name, const size_t len)
+int32_t fsfat_test_filename_gen(char *name, const size_t len)
 {
     size_t i;
     uint32_t pos = 0;
 
-    const char* buf = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!$-_@";
+    const char *buf = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!$-_@";
     const int buf_len = strlen(buf);
     FSFAT_FENTRYLOG("%s:entered\n", __func__);
-    for(i = 0; i < len; i++)
-    {
+    for (i = 0; i < len; i++) {
         pos = rand() % (buf_len);
         name[i] = buf[pos];
     }
diff --git a/components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.h b/components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.h
@@ -57,16 +57,16 @@ extern "C" {
 
 /* kv data for test */
 typedef struct fsfat_kv_data_t {
-    const char* filename;
-    const char* value;
+    const char *filename;
+    const char *value;
 } fsfat_kv_data_t;
 
 
 extern const uint8_t fsfat_test_byte_data_table[FSFAT_TEST_BYTE_DATA_TABLE_SIZE];
 
-int32_t fsfat_test_create(const char* filename, const char* data, size_t len);
-int32_t fsfat_test_delete(const char* key_name);
-int32_t fsfat_test_filename_gen(char* name, const size_t len);
+int32_t fsfat_test_create(const char *filename, const char *data, size_t len);
+int32_t fsfat_test_delete(const char *key_name);
+int32_t fsfat_test_filename_gen(char *name, const size_t len);
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/TESTS/block_device/spif/main.cpp b/components/storage/blockdevice/COMPONENT_SPIF/TESTS/block_device/spif/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void dir_file_check(char *list[], uint32_t elements)`
`171`	`171`	`TEST_ASSERT(1);`
`172`	`172`	`}`
`173`	`173`	`break;`
`174`		`- } else if ( i == elements) {`
	`174`	`+ } else if (i == elements) {`
`175`	`175`	`TEST_ASSERT_EQUAL(0, res);`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ void test_dir_check()`
`294`	`294`	`TEST_ASSERT(1);`
`295`	`295`	`}`
`296`	`296`	`break;`
`297`		`- } else if ( i == numFiles) {`
	`297`	`+ } else if (i == numFiles) {`
`298`	`298`	`TEST_ASSERT_EQUAL(0, res);`
`299`	`299`	`}`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void test_file_tests()`
`97`	`97`	`TEST_ASSERT_EQUAL(0, res);`
`98`	`98`	`}`
`99`	`99`
`100`		`-void write_file_data (char count)`
	`100`	`+void write_file_data(char count)`
`101`	`101`	`{`
`102`	`102`
`103`	`103`	`char filename[10];`
`@@ -125,7 +125,7 @@ void write_file_data (char count)`
`125`	`125`	`TEST_ASSERT_EQUAL(0, res);`
`126`	`126`	`}`
`127`	`127`
`128`		`-void read_file_data (char count)`
	`128`	`+void read_file_data(char count)`
`129`	`129`	`{`
`130`	`130`	`char filename[10];`
`131`	`131`	`uint8_t rbuffer[MBED_TEST_BUFFER];`