From d05d3471fe81722eab0f8f63673a51b2198b7eec Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Fri, 17 Jul 2020 12:07:09 -0700 Subject: [PATCH] Refactore storage/kvstore directory --- storage/kvstore/filesystemstore/mbed_lib.json | 3 --- storage/kvstore/global_api/mbed_lib.json | 3 --- .../{filesystemstore => include/kvstore}/FileSystemStore.h | 2 +- storage/kvstore/{kv_map => include/kvstore}/KVMap.h | 2 +- storage/kvstore/include/{ => kvstore}/KVStore.h | 0 storage/kvstore/{tdbstore => include/kvstore}/TDBStore.h | 2 +- .../{global_api => include/kvstore}/kvstore_global_api.h | 0 storage/kvstore/kv_map/mbed_lib.json | 3 --- .../{filesystemstore => source}/FileSystemStore.cpp | 7 ++----- storage/kvstore/{kv_map => source}/KVMap.cpp | 7 +++---- storage/kvstore/{tdbstore => source}/TDBStore.cpp | 2 +- .../kvstore/{global_api => source}/kvstore_global_api.cpp | 7 +++---- storage/kvstore/tdbstore/mbed_lib.json | 3 --- 13 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 storage/kvstore/filesystemstore/mbed_lib.json delete mode 100644 storage/kvstore/global_api/mbed_lib.json rename storage/kvstore/{filesystemstore => include/kvstore}/FileSystemStore.h (99%) rename storage/kvstore/{kv_map => include/kvstore}/KVMap.h (99%) rename storage/kvstore/include/{ => kvstore}/KVStore.h (100%) rename storage/kvstore/{tdbstore => include/kvstore}/TDBStore.h (99%) rename storage/kvstore/{global_api => include/kvstore}/kvstore_global_api.h (100%) delete mode 100644 storage/kvstore/kv_map/mbed_lib.json rename storage/kvstore/{filesystemstore => source}/FileSystemStore.cpp (99%) rename storage/kvstore/{kv_map => source}/KVMap.cpp (98%) rename storage/kvstore/{tdbstore => source}/TDBStore.cpp (99%) rename storage/kvstore/{global_api => source}/kvstore_global_api.cpp (97%) delete mode 100644 storage/kvstore/tdbstore/mbed_lib.json diff --git a/storage/kvstore/filesystemstore/mbed_lib.json b/storage/kvstore/filesystemstore/mbed_lib.json deleted file mode 100644 index dbcba1eacf..0000000000 --- a/storage/kvstore/filesystemstore/mbed_lib.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "filesystemstore" -} diff --git a/storage/kvstore/global_api/mbed_lib.json b/storage/kvstore/global_api/mbed_lib.json deleted file mode 100644 index 7facc6b0dc..0000000000 --- a/storage/kvstore/global_api/mbed_lib.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "kv-global-api" -} diff --git a/storage/kvstore/filesystemstore/FileSystemStore.h b/storage/kvstore/include/kvstore/FileSystemStore.h similarity index 99% rename from storage/kvstore/filesystemstore/FileSystemStore.h rename to storage/kvstore/include/kvstore/FileSystemStore.h index dd0b10250e..ef1fc5d2b3 100644 --- a/storage/kvstore/filesystemstore/FileSystemStore.h +++ b/storage/kvstore/include/kvstore/FileSystemStore.h @@ -18,7 +18,7 @@ #ifndef MBED_FILE_SYSTEM_STORE_H #define MBED_FILE_SYSTEM_STORE_H -#include "storage/kvstore/include/KVStore.h" +#include "kvstore/KVStore.h" #include "filesystem/FileSystem.h" namespace mbed { diff --git a/storage/kvstore/kv_map/KVMap.h b/storage/kvstore/include/kvstore/KVMap.h similarity index 99% rename from storage/kvstore/kv_map/KVMap.h rename to storage/kvstore/include/kvstore/KVMap.h index 3d8189fa4e..0d030b92ee 100644 --- a/storage/kvstore/kv_map/KVMap.h +++ b/storage/kvstore/include/kvstore/KVMap.h @@ -16,7 +16,7 @@ #ifndef _KV_MAP #define _KV_MAP -#include "storage/kvstore/include/KVStore.h" +#include "kvstore/KVStore.h" #include "platform/PlatformMutex.h" #include "platform/SingletonPtr.h" #include "blockdevice/BlockDevice.h" diff --git a/storage/kvstore/include/KVStore.h b/storage/kvstore/include/kvstore/KVStore.h similarity index 100% rename from storage/kvstore/include/KVStore.h rename to storage/kvstore/include/kvstore/KVStore.h diff --git a/storage/kvstore/tdbstore/TDBStore.h b/storage/kvstore/include/kvstore/TDBStore.h similarity index 99% rename from storage/kvstore/tdbstore/TDBStore.h rename to storage/kvstore/include/kvstore/TDBStore.h index 19844bb796..8a823a1c66 100644 --- a/storage/kvstore/tdbstore/TDBStore.h +++ b/storage/kvstore/include/kvstore/TDBStore.h @@ -19,7 +19,7 @@ #include #include -#include "storage/kvstore/include/KVStore.h" +#include "kvstore/KVStore.h" #include "blockdevice/BlockDevice.h" #include "blockdevice/BufferedBlockDevice.h" #include "PlatformMutex.h" diff --git a/storage/kvstore/global_api/kvstore_global_api.h b/storage/kvstore/include/kvstore/kvstore_global_api.h similarity index 100% rename from storage/kvstore/global_api/kvstore_global_api.h rename to storage/kvstore/include/kvstore/kvstore_global_api.h diff --git a/storage/kvstore/kv_map/mbed_lib.json b/storage/kvstore/kv_map/mbed_lib.json deleted file mode 100644 index 07dc74cdca..0000000000 --- a/storage/kvstore/kv_map/mbed_lib.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "kv-map" -} diff --git a/storage/kvstore/filesystemstore/FileSystemStore.cpp b/storage/kvstore/source/FileSystemStore.cpp similarity index 99% rename from storage/kvstore/filesystemstore/FileSystemStore.cpp rename to storage/kvstore/source/FileSystemStore.cpp index bc1537bcfc..828ff5915b 100644 --- a/storage/kvstore/filesystemstore/FileSystemStore.cpp +++ b/storage/kvstore/source/FileSystemStore.cpp @@ -16,8 +16,8 @@ * limitations under the License. */ -#include "FileSystemStore.h" -#include "storage/kvstore/conf/kv_config.h" +#include "kvstore/FileSystemStore.h" +#include "kv_config/kv_config.h" #include "filesystem/Dir.h" #include "filesystem/File.h" #include "blockdevice/BlockDevice.h" @@ -635,6 +635,3 @@ static char *string_ndup(const char *src, size_t size) string_copy[size] = '\0'; return string_copy; } - - - diff --git a/storage/kvstore/kv_map/KVMap.cpp b/storage/kvstore/source/KVMap.cpp similarity index 98% rename from storage/kvstore/kv_map/KVMap.cpp rename to storage/kvstore/source/KVMap.cpp index dbfb5e2926..506f0fb02d 100644 --- a/storage/kvstore/kv_map/KVMap.cpp +++ b/storage/kvstore/source/KVMap.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "storage/kvstore/include/KVStore.h" -#include "storage/kvstore/kv_map/KVMap.h" -#include "storage/kvstore/conf/kv_config.h" +#include "kvstore/KVStore.h" +#include "kvstore/KVMap.h" +#include "kv_config/kv_config.h" #include #include "string.h" #include "mbed_error.h" @@ -333,4 +333,3 @@ FileSystem *KVMap::get_external_filesystem_instance(const char *name) } } // namespace mbed - diff --git a/storage/kvstore/tdbstore/TDBStore.cpp b/storage/kvstore/source/TDBStore.cpp similarity index 99% rename from storage/kvstore/tdbstore/TDBStore.cpp rename to storage/kvstore/source/TDBStore.cpp index 88e1bad689..b8f2e530dc 100644 --- a/storage/kvstore/tdbstore/TDBStore.cpp +++ b/storage/kvstore/source/TDBStore.cpp @@ -16,7 +16,7 @@ // ----------------------------------------------------------- Includes ----------------------------------------------------------- -#include "TDBStore.h" +#include "kvstore/TDBStore.h" #include #include diff --git a/storage/kvstore/global_api/kvstore_global_api.cpp b/storage/kvstore/source/kvstore_global_api.cpp similarity index 97% rename from storage/kvstore/global_api/kvstore_global_api.cpp rename to storage/kvstore/source/kvstore_global_api.cpp index 5004a7f353..9a9dcc78e3 100644 --- a/storage/kvstore/global_api/kvstore_global_api.cpp +++ b/storage/kvstore/source/kvstore_global_api.cpp @@ -15,9 +15,9 @@ */ #include "kvstore_global_api.h" -#include "storage/kvstore/conf/kv_config.h" -#include "storage/kvstore/kv_map/KVMap.h" -#include "storage/kvstore/include/KVStore.h" +#include "kv_config/kv_config.h" +#include "kvstore/KVMap.h" +#include "kvstore/KVStore.h" #include "mbed_error.h" using namespace mbed; @@ -201,4 +201,3 @@ int kv_reset(const char *kvstore_name) return ret; } - diff --git a/storage/kvstore/tdbstore/mbed_lib.json b/storage/kvstore/tdbstore/mbed_lib.json deleted file mode 100644 index 9ae5f7a889..0000000000 --- a/storage/kvstore/tdbstore/mbed_lib.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "tdbstore" -}