RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 14:32:46 +00:00
Code Issues Activity Actions

LibFileSystem+Userland: Rename size() to size_from_stat()

Browse source 
This reflects what the functions does more accurately, and allows for
adding functions to get sizes through other methods.

This also corrects the return type of said function, as size_t may only
hold sizes up to 4GB on 32-bit platforms.
This commit is contained in:
implicitfield 2024-01-16 12:05:18 +04:00 • committed by Andrew Kaster
parent d3c6e31bf3
commit 896f213c6f
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/SoundPlayer/Playlist.cpp
View file

@ -39,7 +39,7 @@ void Playlist::try_fill_missing_info(Vector<M3UEntry>& entries, StringView path)
entry.path = ByteString::formatted("{}/{}", playlist_path.dirname(), entry.path); entry.path = ByteString::formatted("{}/{}", playlist_path.dirname(), entry.path);
if (!entry.extended_info->file_size_in_bytes.has_value()) { if (!entry.extended_info->file_size_in_bytes.has_value()) {
auto size = FileSystem::size(entry.path); auto size = FileSystem::size_from_stat(entry.path);
if (size.is_error()) if (size.is_error())
continue; continue;
entry.extended_info->file_size_in_bytes = size.value(); entry.extended_info->file_size_in_bytes = size.value();

2
Userland/Libraries/LibFileSystem/FileSystem.cpp
View file

@ -350,7 +350,7 @@ ErrorOr<void> remove(StringView path, RecursionMode mode)
return {}; return {};
} }
ErrorOr<size_t> size(StringView path) ErrorOr<off_t> size_from_stat(StringView path)
{ {
auto st = TRY(Core::System::stat(path)); auto st = TRY(Core::System::stat(path));
return st.st_size; return st.st_size;

2
Userland/Libraries/LibFileSystem/FileSystem.h
View file

@ -71,7 +71,7 @@ ErrorOr<void> copy_directory(StringView destination_path, StringView source_path
ErrorOr<void> copy_file_or_directory(StringView destination_path, StringView source_path, RecursionMode = RecursionMode::Allowed, LinkMode = LinkMode::Disallowed, AddDuplicateFileMarker = AddDuplicateFileMarker::Yes, PreserveMode = PreserveMode::Nothing); ErrorOr<void> copy_file_or_directory(StringView destination_path, StringView source_path, RecursionMode = RecursionMode::Allowed, LinkMode = LinkMode::Disallowed, AddDuplicateFileMarker = AddDuplicateFileMarker::Yes, PreserveMode = PreserveMode::Nothing);
ErrorOr<void> move_file(StringView destination_path, StringView source_path, PreserveMode = PreserveMode::Nothing); ErrorOr<void> move_file(StringView destination_path, StringView source_path, PreserveMode = PreserveMode::Nothing);
ErrorOr<void> remove(StringView path, RecursionMode); ErrorOr<void> remove(StringView path, RecursionMode);
ErrorOr<size_t> size(StringView path); ErrorOr<off_t> size_from_stat(StringView path);
bool can_delete_or_move(StringView path); bool can_delete_or_move(StringView path);
ErrorOr<ByteString> read_link(StringView link_path); ErrorOr<ByteString> read_link(StringView link_path);

2
Userland/Services/WebServer/Client.cpp
View file

@ -170,7 +170,7 @@ ErrorOr<bool> Client::handle_request(HTTP::HttpRequest const& request)
auto const info = ContentInfo { auto const info = ContentInfo {
.type = TRY(String::from_utf8(Core::guess_mime_type_based_on_filename(real_path.bytes_as_string_view()))), .type = TRY(String::from_utf8(Core::guess_mime_type_based_on_filename(real_path.bytes_as_string_view()))),
.length = TRY(FileSystem::size(real_path.bytes_as_string_view())) .length = static_cast<u64>(TRY(FileSystem::size_from_stat(real_path.bytes_as_string_view())))
}; };
TRY(send_response(*stream, request, move(info))); TRY(send_response(*stream, request, move(info)));
return true; return true;

2
Userland/Services/WebServer/Client.h
View file

@ -28,7 +28,7 @@ private:
struct ContentInfo { struct ContentInfo {
String type; String type;
size_t length {}; u64 length {};
}; };
ErrorOr<void, WrappedError> on_ready_to_read(); ErrorOr<void, WrappedError> on_ready_to_read();