Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor filesystem bugs #2563

Merged
merged 5 commits into from
Oct 1, 2022
Merged

Fix minor filesystem bugs #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58ce0e4
Fix return value from Spiffs `fenumxattr()`
mikee47 Aug 31, 2022
4c4cdc9
Fix LittleFS `FileSystem::format()` return value
mikee47 Sep 30, 2022
8ca4df4
Remove (non-const) `Device::partitions()` method
mikee47 Sep 29, 2022
c0604a6
Remove `Partition::getDevice()` method
mikee47 Sep 23, 2022
d9aeecf
Fix `IFS::Stat::printTo()` timestamp printing
mikee47 Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sming/Components/IFS
Open in desktop
Submodule IFS updated 1 files
+1 −1 src/Stat.cpp
5 changes: 0 additions & 5 deletions Sming/Components/Storage/src/include/Storage/Device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ class Device : public LinkedObjectTemplate<Device>
return getName() == name;
}

PartitionTable& partitions()
{
return mPartitions;
}

const PartitionTable& partitions() const
{
return mPartitions;
Expand Down
9 changes: 0 additions & 9 deletions Sming/Components/Storage/src/include/Storage/Partition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,6 @@ class Partition
*/
String getDeviceName() const;

/**
* @brief Get storage device containing this partition
* @retval Device* null if device isn't registered
*/
Device* getDevice() const
{
return mDevice;
}

/**
* @brief Determine if given address contained within this partition
*/
Expand Down
2 changes: 1 addition & 1 deletion Sming/Components/Storage/src/include/Storage/PartitionTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class PartitionTable
/**
* @brief Find the n'th OTA partition
*/
Partition findOta(uint8_t index)
Partition findOta(uint8_t index) const
{
using App = Partition::SubType::App;
auto subtype = App(uint8_t(App::ota0) + index);
Expand Down
2 changes: 1 addition & 1 deletion Sming/Libraries/LittleFS
Open in desktop
Submodule LittleFS updated 1 files
+1 −1 src/FileSystem.cpp
2 changes: 2 additions & 0 deletions Sming/Libraries/Spiffs/src/FileMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ int SpiffsMetaBuffer::enumxattr(AttributeEnumCallback callback, void* buffer, si
continue;
}
e.set(tag, value, getAttributeSize(tag));
++count;
if(!callback(e)) {
return count;
}
Expand All @@ -72,6 +73,7 @@ int SpiffsMetaBuffer::enumxattr(AttributeEnumCallback callback, void* buffer, si
break;
}
e.set(AttributeTag(unsigned(AttributeTag::User) + tagIndex), &user[i], tagSize);
++count;
if(!callback(e)) {
break;
}
Expand Down