RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 01:07:44 +00:00
Code Issues Activity Actions

AK: Rename Stream::write_entire_buffer to Stream::write_until_depleted

Browse source 
No functional changes.
This commit is contained in:
Tim Schumacher 2023-03-01 15:37:45 +01:00 • committed by Linus Groh
parent a3f73e7d85
commit ecd1862859
46 changed files with 141 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibArchive/TarStream.cpp
View file

@ -154,9 +154,9 @@ ErrorOr<void> TarOutputStream::add_directory(StringView path, mode_t mode)
header.set_magic(gnu_magic);
header.set_version(gnu_version);
TRY(header.calculate_checksum());
TRY(m_stream->write_entire_buffer(Bytes { &header, sizeof(header) }));
TRY(m_stream->write_until_depleted(Bytes { &header, sizeof(header) }));
u8 padding[block_size] = { 0 };
TRY(m_stream->write_entire_buffer(Bytes { &padding, block_size - sizeof(header) }));
TRY(m_stream->write_until_depleted(Bytes { &padding, block_size - sizeof(header) }));
return {};
}
@ -171,14 +171,14 @@ ErrorOr<void> TarOutputStream::add_file(StringView path, mode_t mode, ReadonlyBy
header.set_magic(gnu_magic);
header.set_version(gnu_version);
TRY(header.calculate_checksum());
TRY(m_stream->write_entire_buffer(ReadonlyBytes { &header, sizeof(header) }));
TRY(m_stream->write_until_depleted(ReadonlyBytes { &header, sizeof(header) }));
constexpr Array<u8, block_size> padding { 0 };
TRY(m_stream->write_entire_buffer(ReadonlyBytes { &padding, block_size - sizeof(header) }));
TRY(m_stream->write_until_depleted(ReadonlyBytes { &padding, block_size - sizeof(header) }));
size_t n_written = 0;
while (n_written < bytes.size()) {
n_written += MUST(m_stream->write_some(bytes.slice(n_written, min(bytes.size() - n_written, block_size))));
}
TRY(m_stream->write_entire_buffer(ReadonlyBytes { &padding, block_size - (n_written % block_size) }));
TRY(m_stream->write_until_depleted(ReadonlyBytes { &padding, block_size - (n_written % block_size) }));
return {};
}
@ -194,9 +194,9 @@ ErrorOr<void> TarOutputStream::add_link(StringView path, mode_t mode, StringView
header.set_version(gnu_version);
header.set_link_name(link_name);
TRY(header.calculate_checksum());
TRY(m_stream->write_entire_buffer(Bytes { &header, sizeof(header) }));
TRY(m_stream->write_until_depleted(Bytes { &header, sizeof(header) }));
u8 padding[block_size] = { 0 };
TRY(m_stream->write_entire_buffer(Bytes { &padding, block_size - sizeof(header) }));
TRY(m_stream->write_until_depleted(Bytes { &padding, block_size - sizeof(header) }));
return {};
}
@ -205,8 +205,8 @@ ErrorOr<void> TarOutputStream::finish()
VERIFY(!m_finished);
constexpr Array<u8, block_size> padding { 0 };
// 2 empty records that are used to signify the end of the archive.
TRY(m_stream->write_entire_buffer(ReadonlyBytes { &padding, block_size }));
TRY(m_stream->write_entire_buffer(ReadonlyBytes { &padding, block_size }));
TRY(m_stream->write_until_depleted(ReadonlyBytes { &padding, block_size }));
TRY(m_stream->write_until_depleted(ReadonlyBytes { &padding, block_size }));
m_finished = true;
return {};
}

26
Userland/Libraries/LibArchive/Zip.h
View file

@ -60,10 +60,10 @@ struct [[gnu::packed]] EndOfCentralDirectory {
ErrorOr<void> write(Stream& stream) const
{
auto write_value = [&stream](auto value) {
return stream.write_entire_buffer({ &value, sizeof(value) });
return stream.write_until_depleted({ &value, sizeof(value) });
};
TRY(stream.write_entire_buffer(signature));
TRY(stream.write_until_depleted(signature));
TRY(write_value(disk_number));
TRY(write_value(central_directory_start_disk));
TRY(write_value(disk_records_count));
@ -72,7 +72,7 @@ struct [[gnu::packed]] EndOfCentralDirectory {
TRY(write_value(central_directory_offset));
TRY(write_value(comment_length));
if (comment_length > 0)
TRY(stream.write_entire_buffer({ comment, comment_length }));
TRY(stream.write_until_depleted({ comment, comment_length }));
return {};
}
};
@ -146,10 +146,10 @@ struct [[gnu::packed]] CentralDirectoryRecord {
ErrorOr<void> write(Stream& stream) const
{
auto write_value = [&stream](auto value) {
return stream.write_entire_buffer({ &value, sizeof(value) });
return stream.write_until_depleted({ &value, sizeof(value) });
};
TRY(stream.write_entire_buffer(signature));
TRY(stream.write_until_depleted(signature));
TRY(write_value(made_by_version));
TRY(write_value(minimum_version));
TRY(write_value(general_purpose_flags.flags));
@ -167,11 +167,11 @@ struct [[gnu::packed]] CentralDirectoryRecord {
TRY(write_value(external_attributes));
TRY(write_value(local_file_header_offset));
if (name_length > 0)
TRY(stream.write_entire_buffer({ name, name_length }));
TRY(stream.write_until_depleted({ name, name_length }));
if (extra_data_length > 0)
TRY(stream.write_entire_buffer({ extra_data, extra_data_length }));
TRY(stream.write_until_depleted({ extra_data, extra_data_length }));
if (comment_length > 0)
TRY(stream.write_entire_buffer({ comment, comment_length }));
TRY(stream.write_until_depleted({ comment, comment_length }));
return {};
}
@ -215,10 +215,10 @@ struct [[gnu::packed]] LocalFileHeader {
ErrorOr<void> write(Stream& stream) const
{
auto write_value = [&stream](auto value) {
return stream.write_entire_buffer({ &value, sizeof(value) });
return stream.write_until_depleted({ &value, sizeof(value) });
};
TRY(stream.write_entire_buffer(signature));
TRY(stream.write_until_depleted(signature));
TRY(write_value(minimum_version));
TRY(write_value(general_purpose_flags.flags));
TRY(write_value(compression_method));
@ -230,11 +230,11 @@ struct [[gnu::packed]] LocalFileHeader {
TRY(write_value(name_length));
TRY(write_value(extra_data_length));
if (name_length > 0)
TRY(stream.write_entire_buffer({ name, name_length }));
TRY(stream.write_until_depleted({ name, name_length }));
if (extra_data_length > 0)
TRY(stream.write_entire_buffer({ extra_data, extra_data_length }));
TRY(stream.write_until_depleted({ extra_data, extra_data_length }));
if (compressed_size > 0)
TRY(stream.write_entire_buffer({ compressed_data, compressed_size }));
TRY(stream.write_until_depleted({ compressed_data, compressed_size }));
return {};
}
};