Skip to content

Commit 9c9a5d7

Browse files
aentingeraentinger
committed
Place KeyValueStorage_littlefs into namespace littlefs and rename to KeyValueStorage.
1 parent c5b1406 commit 9c9a5d7

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎src/storage/kv_storage/littlefs/kv_littlefs.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* NAMESPACE
2323
**************************************************************************************/
2424

25-
namespace cyphal::support::platform::storage
25+
namespace cyphal::support::platform::storage::littlefs
2626
{
2727

2828
/**************************************************************************************
@@ -37,25 +37,25 @@ namespace cyphal::support::platform::storage
3737
return key_filename.str();
3838
}
3939

40-
[[nodiscard]] static inline Error toError(littlefs::Error const err)
40+
[[nodiscard]] static inline Error toError(::littlefs::Error const err)
4141
{
42-
static std::map<littlefs::Error, Error> const LITTLEFS_TO_STORAGE_ERROR_MAP =
42+
static std::map<::littlefs::Error, Error> const LITTLEFS_TO_STORAGE_ERROR_MAP =
4343
{
44-
{littlefs::Error::IO , Error::IO},
45-
{littlefs::Error::CORRUPT , Error::Internal},
46-
{littlefs::Error::NOENT , Error::Existence},
47-
{littlefs::Error::EXIST , Error::Existence},
48-
{littlefs::Error::NOTDIR , Error::Existence},
49-
{littlefs::Error::ISDIR , Error::Existence},
50-
{littlefs::Error::NOTEMPTY , Error::Existence},
51-
{littlefs::Error::BADF , Error::Internal},
52-
{littlefs::Error::FBIG , Error::Capacity},
53-
{littlefs::Error::INVAL , Error::API},
54-
{littlefs::Error::NOSPC , Error::Capacity},
55-
{littlefs::Error::NOMEM , Error::Internal},
56-
{littlefs::Error::NOATTR , Error::API},
57-
{littlefs::Error::NAMETOOLONG , Error::API},
58-
{littlefs::Error::NO_FD_ENTRY , Error::API},
44+
{::littlefs::Error::IO , Error::IO},
45+
{::littlefs::Error::CORRUPT , Error::Internal},
46+
{::littlefs::Error::NOENT , Error::Existence},
47+
{::littlefs::Error::EXIST , Error::Existence},
48+
{::littlefs::Error::NOTDIR , Error::Existence},
49+
{::littlefs::Error::ISDIR , Error::Existence},
50+
{::littlefs::Error::NOTEMPTY , Error::Existence},
51+
{::littlefs::Error::BADF , Error::Internal},
52+
{::littlefs::Error::FBIG , Error::Capacity},
53+
{::littlefs::Error::INVAL , Error::API},
54+
{::littlefs::Error::NOSPC , Error::Capacity},
55+
{::littlefs::Error::NOMEM , Error::Internal},
56+
{::littlefs::Error::NOATTR , Error::API},
57+
{::littlefs::Error::NAMETOOLONG , Error::API},
58+
{::littlefs::Error::NO_FD_ENTRY , Error::API},
5959
};
6060

6161
return LITTLEFS_TO_STORAGE_ERROR_MAP.at(err);
@@ -65,27 +65,27 @@ namespace cyphal::support::platform::storage
6565
* CTOR/DTOR
6666
**************************************************************************************/
6767

68-
KeyValueStorage_littlefs::KeyValueStorage_littlefs(littlefs::Filesystem & filesystem)
68+
KeyValueStorage::KeyValueStorage(::littlefs::Filesystem & filesystem)
6969
: _filesystem{filesystem}
7070
{ }
7171

7272
/**************************************************************************************
7373
* PUBLIC MEMBER FUNCTIONS
7474
**************************************************************************************/
7575

76-
auto KeyValueStorage_littlefs::get(const std::string_view key, const std::size_t size, void* const data) const
76+
auto KeyValueStorage::get(const std::string_view key, const std::size_t size, void* const data) const
7777
-> std::variant<Error, std::size_t>
7878
{
7979
/* Open the file containing the registry value. */
80-
auto const rc_open = _filesystem.open(toFilename(key), littlefs::OpenFlag::RDONLY);
81-
if (const auto * const err = std::get_if<littlefs::Error>(&rc_open))
80+
auto const rc_open = _filesystem.open(toFilename(key), ::littlefs::OpenFlag::RDONLY);
81+
if (const auto * const err = std::get_if<::littlefs::Error>(&rc_open))
8282
return toError(*err);
8383

84-
littlefs::FileHandle const file_hdl = std::get<littlefs::FileHandle>(rc_open);
84+
auto const file_hdl = std::get<::littlefs::FileHandle>(rc_open);
8585

8686
/* Read from the file. */
8787
auto const rc_read = _filesystem.read(file_hdl, data, size);
88-
if (const auto * const err = std::get_if<littlefs::Error>(&rc_read))
88+
if (const auto * const err = std::get_if<::littlefs::Error>(&rc_read))
8989
{
9090
(void)_filesystem.close(file_hdl);
9191
return toError(*err);
@@ -96,19 +96,19 @@ auto KeyValueStorage_littlefs::get(const std::string_view key, const std::size_t
9696
return std::get<size_t>(rc_read);
9797
}
9898

99-
auto KeyValueStorage_littlefs::put(const std::string_view key, const std::size_t size, const void* const data)
99+
auto KeyValueStorage::put(const std::string_view key, const std::size_t size, const void* const data)
100100
-> std::optional<Error>
101101
{
102102
/* Open the file containing the registry value. */
103-
auto const rc_open = _filesystem.open(toFilename(key), littlefs::OpenFlag::WRONLY | littlefs::OpenFlag::CREAT | littlefs::OpenFlag::TRUNC);
104-
if (const auto * const err = std::get_if<littlefs::Error>(&rc_open))
103+
auto const rc_open = _filesystem.open(toFilename(key), ::littlefs::OpenFlag::WRONLY | ::littlefs::OpenFlag::CREAT | ::littlefs::OpenFlag::TRUNC);
104+
if (const auto * const err = std::get_if<::littlefs::Error>(&rc_open))
105105
return toError(*err);
106106

107-
littlefs::FileHandle const file_hdl = std::get<littlefs::FileHandle>(rc_open);
107+
auto const file_hdl = std::get<::littlefs::FileHandle>(rc_open);
108108

109109
/* Write to the file. */
110110
auto const rc_write = _filesystem.write(file_hdl, data, size);
111-
if (const auto * const err = std::get_if<littlefs::Error>(&rc_write))
111+
if (const auto * const err = std::get_if<::littlefs::Error>(&rc_write))
112112
{
113113
(void)_filesystem.close(file_hdl);
114114
return toError(*err);
@@ -126,9 +126,9 @@ auto KeyValueStorage_littlefs::put(const std::string_view key, const std::size_t
126126
return std::nullopt;
127127
}
128128

129-
auto KeyValueStorage_littlefs::drop(const std::string_view key) -> std::optional<Error>
129+
auto KeyValueStorage::drop(const std::string_view key) -> std::optional<Error>
130130
{
131-
if (auto const err = _filesystem.remove(toFilename(key)); err != littlefs::Error::OK)
131+
if (auto const err = _filesystem.remove(toFilename(key)); err != ::littlefs::Error::OK)
132132
return toError(err);
133133

134134
return std::nullopt;
@@ -138,6 +138,6 @@ auto KeyValueStorage_littlefs::drop(const std::string_view key) -> std::optional
138138
* NAMESPACE
139139
**************************************************************************************/
140140

141-
} /* cyphal::support::platform::storage */
141+
} /* cyphal::support::platform::storage::littlefs */
142142

143143
#endif /* __GNUC__ >= 11 */

‎src/storage/kv_storage/littlefs/kv_littlefs.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
* NAMESPACE
2121
**************************************************************************************/
2222

23-
namespace cyphal::support::platform::storage
23+
namespace cyphal::support::platform::storage::littlefs
2424
{
2525

2626
/**************************************************************************************
2727
* CLASS DECLARATION
2828
**************************************************************************************/
2929

30-
class KeyValueStorage_littlefs final : public interface::KeyValueStorage
30+
class KeyValueStorage final : public interface::KeyValueStorage
3131
{
3232
private:
33-
littlefs::Filesystem & _filesystem;
33+
::littlefs::Filesystem & _filesystem;
3434

3535
public:
36-
KeyValueStorage_littlefs(littlefs::Filesystem & filesystem);
37-
virtual ~KeyValueStorage_littlefs() { }
36+
KeyValueStorage(::littlefs::Filesystem & filesystem);
37+
virtual ~KeyValueStorage() { }
3838

3939
/// The return value is the number of bytes read into the buffer or the error.
4040
[[nodiscard]] virtual auto get(const std::string_view key, const std::size_t size, void* const data) const
@@ -53,6 +53,6 @@ class KeyValueStorage_littlefs final : public interface::KeyValueStorage
5353
* NAMESPACE
5454
**************************************************************************************/
5555

56-
} /* cyphal::support::platform::storage */
56+
} /* cyphal::support::platform::storage::littlefs */
5757

5858
#endif /* __GNUC__ >= 11 */

0 commit comments

Comments
 (0)