Astyle fixes

Author: pea-pod

features/storage/TESTS/kvstore/filesystemstore_tests/main.cpp

@@ -102,7 +102,7 @@ void test_file_system_store_functionality_unit_test()
 
     err = fsst->init(InitModeFlags::ExclusiveCreation | InitModeFlags::ReadWrite);
     TEST_ASSER_EQUAL_ERROR_CODE(MBED_ERROR_INITIALIZATION_FAILED, err);
-    
+
     err = fsst->init();
     TEST_ASSERT_EQUAL_ERROR_CODE(0, err);
 

features/storage/kvstore/filesystemstore/FileSystemStore.cpp

@@ -77,7 +77,7 @@ int FileSystemStore::init(InitModeFlags flags)
         return MBED_ERROR_INVALID_ARGUMENT;
     }
     if (!((flags & InitModeFlags::Append) == InitModeFlags::Append ||
-        (flags & InitModeFlags::ExclusiveCreation) == InitModeFlags::ExclusiveCreation)) {
+            (flags & InitModeFlags::ExclusiveCreation) == InitModeFlags::ExclusiveCreation)) {
         return MBED_ERROR_UNSUPPORTED;
     }
 
@@ -520,7 +520,7 @@ int FileSystemStore::iterator_open(iterator_t *it, const char *prefix)
     if (!KVStore::_has_flags_any(InitModeFlags::Read | InitModeFlags::WriteOnlyAllowKeyRead)) {
         return MBED_ERROR_INVALID_OPERATION;
     }
-    
+
     if (it == NULL) {
         return MBED_ERROR_INVALID_ARGUMENT;
     }

features/storage/kvstore/filesystemstore/FileSystemStore.h

@@ -52,9 +52,9 @@ class FileSystemStore : public KVStore {
       *
       * @param[in]  flags                            Flags that determine how the FileSystemStore allows KV
       *                                              read/write and store creation.
-      * 
+      *
       * @returns MBED_SUCCESS                        Success.
-      *          MBED_ERROR_INITIALIZATION_FAILED    No valid FileSystemStore found on the device. 
+      *          MBED_ERROR_INITIALIZATION_FAILED    No valid FileSystemStore found on the device.
       *          MBED_ERROR_FAILED_OPERATION         Underlying file system failed operation.
       */
     virtual int init(InitModeFlags flags = DEFAULT_INIT_FLAGS);

features/storage/kvstore/include/InitModeFlags.h

@@ -8,18 +8,19 @@ namespace mbed {
 
 /**
  * @brief A set of creation flags for the KVStore instance.
- * 
+ *
  * The Read, Write, and ReadWrite flags may be OR-ed to produce the correct initialization
  * sequence. This is similar to how a file is opened.
- * 
+ *
  * By default, the init mode opens in ReadWrite and Append mode as the default argument.
- * 
+ *
  * At least one of Read, Write, or ReadWrite must be specified. Additionally, at least one
  * of the following must be specified with write access: Append, Truncate, CreateNewOnly, or
  * ExclusiveCreation.
- * 
+ *
  */
-MBED_SCOPED_ENUM_FLAGS(InitModeFlags) {
+MBED_SCOPED_ENUM_FLAGS(InitModeFlags)
+{
     Read                    = (1 << 0),                 //!< Enable read access from the KVStore
     Write                   = (1 << 1),                 //!< Enable write access to the KVStore
     ReadWrite               = ((1 << 0) | (1 << 1)),    //!< Enable read and write access to the KVSTore. This is the default.

features/storage/kvstore/include/KVStore.cpp

@@ -20,7 +20,8 @@
 namespace mbed {
 
 
-bool KVStore::is_valid_key(const char *key) const {
+bool KVStore::is_valid_key(const char *key) const
+{
     if (!key || !strlen(key) || (strlen(key) > MAX_KEY_SIZE)) {
         return false;
     }
@@ -31,12 +32,13 @@ bool KVStore::is_valid_key(const char *key) const {
     return true;
 }
 
-bool KVStore::_is_valid_flags(InitModeFlags flags) {
+bool KVStore::_is_valid_flags(InitModeFlags flags)
+{
     // Check that only valid bits are here at all
     if ((~(InitModeFlags::AllFlags) & flags) == InitModeFlags::NoFlags) {
         return false;
     }
-    
+
     // Need at least one of the Read or Write bits set
     if ((flags & InitModeFlags::ReadWrite) == InitModeFlags::NoFlags) {
         return false;
@@ -56,7 +58,8 @@ bool KVStore::_is_valid_flags(InitModeFlags flags) {
     return true;
 }
 
-bool KVStore::_has_flags_any(InitModeFlags flags) const {
+bool KVStore::_has_flags_any(InitModeFlags flags) const
+{
     return !(((_flags & flags)) == InitModeFlags::NoFlags);
 }
 

features/storage/kvstore/include/KVStore.h

@@ -37,7 +37,7 @@ class KVStore {
         REQUIRE_REPLAY_PROTECTION_FLAG      = (1 << 3),
     };
 
-    
+
 
     static const InitModeFlags DEFAULT_INIT_FLAGS = InitModeFlags::ReadWrite | InitModeFlags::Append;
 
@@ -76,8 +76,8 @@ class KVStore {
      *
      * @param[in]  flags                            Flags that determine how the FileSystemStore allows KV
      *                                              read/write and store creation.
-     * 
-     * 
+     *
+     *
      * @returns MBED_ERROR_INITIALIZATION_FAILED    No valid KVStore in the storage.
      *          MBED_SUCCESS on success or an error code on other failure
      */
@@ -219,7 +219,7 @@ class KVStore {
     InitModeFlags _flags;
 
     bool _has_flags_any(InitModeFlags flags) const;
-    
+
     static bool _is_valid_flags(InitModeFlags flags);
 };
 #endif // DOXYGEN_ONLY

features/storage/kvstore/securestore/SecureStore.cpp

@@ -737,7 +737,7 @@ int SecureStore::get(const char *key, void *buffer, size_t buffer_size, size_t *
     if (!KVStore::_has_flags_any(InitModeFlags::Read)) {
         return MBED_ERROR_INVALID_OPERATION;
     }
-    
+
     _mutex.lock();
     int ret = do_get(key, buffer, buffer_size, actual_size, offset);
     _mutex.unlock();
@@ -750,7 +750,7 @@ int SecureStore::get_info(const char *key, info_t *info)
     if (!KVStore::_has_flags_any(InitModeFlags::Read)) {
         return MBED_ERROR_INVALID_OPERATION;
     }
-    
+
     _mutex.lock();
     int ret = do_get(key, 0, 0, 0, 0, info);
     _mutex.unlock();
@@ -764,7 +764,7 @@ int SecureStore::init(InitModeFlags flags)
     if (!KVStore::_is_valid_flags(flags)) {
         return MBED_ERROR_INVALID_ARGUMENT;
     }
-    
+
     int ret = MBED_SUCCESS;
 
     MBED_ASSERT(!(scratch_buf_size % enc_block_size));

features/storage/kvstore/securestore/SecureStore.h

@@ -74,7 +74,7 @@ class SecureStore : public KVStore {
      * @brief Initialize SecureStore class. It will also initialize
      *        the underlying KVStore and the rollback protection KVStore by default.
      *        If other init modes are needed, set the flags as necessary.
-     * 
+     *
      * @param[in]  flags                            Flags that determine how the FileSystemStore allows KV
      *                                              read/write and store creation.
      *

features/storage/kvstore/tdbstore/TDBStore.cpp

@@ -747,7 +747,7 @@ int TDBStore::remove(const char *key)
     if (!KVStore::_has_flags_any(InitModeFlags::Write)) {
         return MBED_ERROR_INVALID_OPERATION;
     }
-    
+
     return set(key, 0, 0, delete_flag);
 }
 
@@ -1036,10 +1036,10 @@ int TDBStore::init(InitModeFlags flags)
         return MBED_ERROR_INVALID_ARGUMENT;
     }
     if (!((flags & InitModeFlags::Append) == InitModeFlags::Append ||
-        (flags & InitModeFlags::ExclusiveCreation) == InitModeFlags::ExclusiveCreation)) {
+            (flags & InitModeFlags::ExclusiveCreation) == InitModeFlags::ExclusiveCreation)) {
         return MBED_ERROR_UNSUPPORTED;
     }
-    
+
     ram_table_entry_t *ram_table;
     area_state_e area_state[_num_areas];
     uint32_t next_offset;
@@ -1503,7 +1503,7 @@ int TDBStore::reserved_data_get(void *reserved_data, size_t reserved_data_buf_si
     if (!KVStore::_has_flags_any(InitModeFlags::Read)) {
         return MBED_ERROR_INVALID_OPERATION;
     }
-    
+
     _mutex.lock();
     int ret = do_reserved_data_get(reserved_data, reserved_data_buf_size, actual_data_size);
     _mutex.unlock();

features/storage/kvstore/tdbstore/TDBStore.h

@@ -65,7 +65,7 @@ class TDBStore : public KVStore {
      *
      * @param[in]  flags                            Flags that determine how the FileSystemStore allows KV
      *                                              read/write and store creation.
-     * 
+     *
      * @returns MBED_SUCCESS                        Success.
      *          MBED_ERROR_INITIALIZATION_FAILED    No valid TBD store found in the BlockDevice.
      * @returns Negative error code on other failure.