mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 02:47:34 +00:00
AK+Everywhere: Rename String to DeprecatedString
We have a new, improved string type coming up in AK (OOM aware, no null state), and while it's going to use UTF-8, the name UTF8String is a mouthful - so let's free up the String name by renaming the existing class. Making the old one have an annoying name will hopefully also help with quick adoption :^)
This commit is contained in:
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
@ -27,7 +27,7 @@ unsigned TarFileHeader::expected_checksum() const
|
|||
void TarFileHeader::calculate_checksum()
|
||||
{
|
||||
memset(m_checksum, ' ', sizeof(m_checksum));
|
||||
VERIFY(String::formatted("{:06o}", expected_checksum()).copy_characters_to_buffer(m_checksum, sizeof(m_checksum)));
|
||||
VERIFY(DeprecatedString::formatted("{:06o}", expected_checksum()).copy_characters_to_buffer(m_checksum, sizeof(m_checksum)));
|
||||
}
|
||||
|
||||
bool TarFileHeader::is_zero_block() const
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -84,7 +84,7 @@ static void set_field(char (&field)[N], TSource&& source)
|
|||
template<class TSource, size_t N>
|
||||
static void set_octal_field(char (&field)[N], TSource&& source)
|
||||
{
|
||||
set_field(field, String::formatted("{:o}", forward<TSource>(source)));
|
||||
set_field(field, DeprecatedString::formatted("{:o}", forward<TSource>(source)));
|
||||
}
|
||||
|
||||
class [[gnu::packed]] TarFileHeader {
|
||||
|
|
|
@ -142,12 +142,12 @@ TarOutputStream::TarOutputStream(OutputStream& stream)
|
|||
{
|
||||
}
|
||||
|
||||
void TarOutputStream::add_directory(String const& path, mode_t mode)
|
||||
void TarOutputStream::add_directory(DeprecatedString const& path, mode_t mode)
|
||||
{
|
||||
VERIFY(!m_finished);
|
||||
TarFileHeader header {};
|
||||
header.set_size(0);
|
||||
header.set_filename_and_prefix(String::formatted("{}/", path)); // Old tar implementations assume directory names end with a /
|
||||
header.set_filename_and_prefix(DeprecatedString::formatted("{}/", path)); // Old tar implementations assume directory names end with a /
|
||||
header.set_type_flag(TarFileType::Directory);
|
||||
header.set_mode(mode);
|
||||
header.set_magic(gnu_magic);
|
||||
|
@ -158,7 +158,7 @@ void TarOutputStream::add_directory(String const& path, mode_t mode)
|
|||
VERIFY(m_stream.write_or_error(Bytes { &padding, block_size - sizeof(header) }));
|
||||
}
|
||||
|
||||
void TarOutputStream::add_file(String const& path, mode_t mode, ReadonlyBytes bytes)
|
||||
void TarOutputStream::add_file(DeprecatedString const& path, mode_t mode, ReadonlyBytes bytes)
|
||||
{
|
||||
VERIFY(!m_finished);
|
||||
TarFileHeader header {};
|
||||
|
@ -179,7 +179,7 @@ void TarOutputStream::add_file(String const& path, mode_t mode, ReadonlyBytes by
|
|||
VERIFY(m_stream.write_or_error(ReadonlyBytes { &padding, block_size - (n_written % block_size) }));
|
||||
}
|
||||
|
||||
void TarOutputStream::add_link(String const& path, mode_t mode, StringView link_name)
|
||||
void TarOutputStream::add_link(DeprecatedString const& path, mode_t mode, StringView link_name)
|
||||
{
|
||||
VERIFY(!m_finished);
|
||||
TarFileHeader header {};
|
||||
|
|
|
@ -59,9 +59,9 @@ private:
|
|||
class TarOutputStream {
|
||||
public:
|
||||
TarOutputStream(OutputStream&);
|
||||
void add_file(String const& path, mode_t, ReadonlyBytes);
|
||||
void add_link(String const& path, mode_t, StringView);
|
||||
void add_directory(String const& path, mode_t);
|
||||
void add_file(DeprecatedString const& path, mode_t, ReadonlyBytes);
|
||||
void add_link(DeprecatedString const& path, mode_t, StringView);
|
||||
void add_directory(DeprecatedString const& path, mode_t);
|
||||
void finish();
|
||||
|
||||
private:
|
||||
|
|
|
@ -93,7 +93,7 @@ bool Zip::for_each_member(Function<IterationDecision(ZipMember const&)> callback
|
|||
char null_terminated_name[central_directory_record.name_length + 1];
|
||||
memcpy(null_terminated_name, central_directory_record.name, central_directory_record.name_length);
|
||||
null_terminated_name[central_directory_record.name_length] = 0;
|
||||
member.name = String { null_terminated_name };
|
||||
member.name = DeprecatedString { null_terminated_name };
|
||||
member.compressed_data = { local_file_header.compressed_data, central_directory_record.compressed_size };
|
||||
member.compression_method = central_directory_record.compression_method;
|
||||
member.uncompressed_size = central_directory_record.uncompressed_size;
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/Array.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Function.h>
|
||||
#include <AK/IterationDecision.h>
|
||||
#include <AK/Stream.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <string.h>
|
||||
|
||||
|
@ -225,7 +225,7 @@ struct [[gnu::packed]] LocalFileHeader {
|
|||
};
|
||||
|
||||
struct ZipMember {
|
||||
String name;
|
||||
DeprecatedString name;
|
||||
ReadonlyBytes compressed_data; // TODO: maybe the decompression/compression should be handled by LibArchive instead of the user?
|
||||
ZipCompressionMethod compression_method;
|
||||
u32 uncompressed_size;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue