nvstore: astyle update

Author: 0xc0170

features/nvstore/TESTS/nvstore/functionality/main.cpp

@@ -359,7 +359,7 @@ static void thread_test_check_key(uint16_t key)
 
     if (key == thr_test_data->last_key) {
         if ((thr_test_data->sizes[key][thr_test_data->last_ind] == actual_len_bytes) &&
-            (!memcmp(thr_test_data->buffs[key][thr_test_data->last_ind], get_buff, actual_len_bytes))) {
+                (!memcmp(thr_test_data->buffs[key][thr_test_data->last_ind], get_buff, actual_len_bytes))) {
             return;
         }
     }
@@ -428,7 +428,7 @@ static void nvstore_multi_thread_test()
     }
 
     for (i = 0; i < num_threads; i++) {
-        threads[i] = new rtos::Thread((osPriority_t)((int)osPriorityBelowNormal-num_threads+i), thr_test_stack_size);
+        threads[i] = new rtos::Thread((osPriority_t)((int)osPriorityBelowNormal - num_threads + i), thr_test_stack_size);
         threads[i]->start(callback(thread_test_worker));
     }
 
@@ -529,7 +529,8 @@ static void nvstore_race_test()
 
 
 
-utest::v1::status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
+utest::v1::status_t greentea_failure_handler(const Case *const source, const failure_t reason)
+{
     greentea_case_failure_abort_handler(source, reason);
     return STATUS_CONTINUE;
 }

features/nvstore/source/nvstore.cpp

@@ -39,8 +39,7 @@ static const uint16_t master_record_key = 0xFFE;
 static const uint16_t no_key            = 0xFFF;
 static const uint16_t last_reserved_key = master_record_key;
 
-typedef struct
-{
+typedef struct {
     uint16_t key_and_flags;
     uint16_t size;
     uint32_t crc;
@@ -79,10 +78,12 @@ static const uint8_t blank_flash_val = 0xFF;
 #endif
 
 NVStore::nvstore_area_data_t NVStore::initial_area_params[] = {{NVSTORE_AREA_1_ADDRESS, NVSTORE_AREA_1_SIZE},
-                                                               {NVSTORE_AREA_2_ADDRESS, NVSTORE_AREA_2_SIZE}};
+    {NVSTORE_AREA_2_ADDRESS, NVSTORE_AREA_2_SIZE}
+};
 #else
 NVStore::nvstore_area_data_t NVStore::initial_area_params[] = {{0, 0},
-                                                               {0, 0}};
+    {0, 0}
+};
 #endif
 
 typedef enum {
@@ -121,18 +122,18 @@ static uint32_t crc32(uint32_t init_crc, uint32_t data_size, uint8_t *data_buf)
 
     crc = init_crc;
     for (i = 0; i < data_size; i++) {
-        crc = crc ^ (uint32_t) (data_buf[i]);
+        crc = crc ^ (uint32_t)(data_buf[i]);
         for (j = 0; j < 8; j++) {
-          mask = -(crc & 1);
-          crc = (crc >> 1) ^ (0xEDB88320 & mask);
+            mask = -(crc & 1);
+            crc = (crc >> 1) ^ (0xEDB88320 & mask);
         }
     }
     return crc;
 }
 
 NVStore::NVStore() : _init_done(0), _init_attempts(0), _active_area(0), _max_keys(NVSTORE_MAX_KEYS),
-      _active_area_version(0), _free_space_offset(0), _size(0), _mutex(0), _offset_by_key(0), _flash(0),
-      _min_prog_size(0), _page_buf(0)
+    _active_area_version(0), _free_space_offset(0), _size(0), _mutex(0), _offset_by_key(0), _flash(0),
+    _min_prog_size(0), _page_buf(0)
 {
 }
 
@@ -261,7 +262,7 @@ void NVStore::calc_validate_area_params()
         _flash_area_params[area].size = 0;
         int i;
         for (i = num_sectors - 1; i >= 0; i--) {
-            sector_size = sector_map[i+1] - sector_map[i];
+            sector_size = sector_map[i + 1] - sector_map[i];
             _flash_area_params[area].size += sector_size;
             if (_flash_area_params[area].size >= min_area_size) {
                 _flash_area_params[area].address = sector_map[i];
@@ -524,7 +525,7 @@ int NVStore::garbage_collection(uint16_t key, uint16_t flags, uint16_t buf_size,
             return ret;
         }
         _offset_by_key[key] = new_area_offset | (1 - _active_area) << offs_by_key_area_bit_pos |
-                                (((flags & set_once_flag) != 0) << offs_by_key_set_once_bit_pos);
+                              (((flags & set_once_flag) != 0) << offs_by_key_set_once_bit_pos);
         new_area_offset = next_offset;
     }
 

features/nvstore/source/nvstore.h

@@ -61,7 +61,7 @@ class NVStore : private mbed::NonCopyable<NVStore> {
     *
     * @returns Singleton instance reference.
     */
-    static NVStore& get_instance()
+    static NVStore &get_instance()
     {
         // Use this implementation of singleton (Meyer's) rather than the one that allocates
         // the instance on the heap because it ensures destruction at program end (preventing warnings