mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 10:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibTextCodec: Do not allocate the various decoders

Browse source 
These objects contain no data members, so there is no point in creating
1-byte heap allocations for them. We don't need to have them as static
local variables, as they are trivially constructible, so they can simply
be global variables.
This commit is contained in:
Daniel Bertalan 2022-01-28 21:52:06 +01:00 • committed by Andreas Kling
parent 7d11edbe17
commit 6003b6f4d3
1 changed files with 18 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
Userland/Libraries/LibTextCodec/Decoder.cpp
View file

@ -11,78 +11,15 @@
namespace TextCodec {
namespace {
Latin1Decoder& latin1_decoder()
{
static Latin1Decoder* decoder = nullptr;
if (!decoder)
decoder = new Latin1Decoder;
return *decoder;
}
UTF8Decoder& utf8_decoder()
{
static UTF8Decoder* decoder = nullptr;
if (!decoder)
decoder = new UTF8Decoder;
return *decoder;
}
UTF16BEDecoder& utf16be_decoder()
{
static UTF16BEDecoder* decoder = nullptr;
if (!decoder)
decoder = new UTF16BEDecoder;
return *decoder;
}
Latin2Decoder& latin2_decoder()
{
static Latin2Decoder* decoder = nullptr;
if (!decoder)
decoder = new Latin2Decoder;
return *decoder;
}
HebrewDecoder& hebrew_decoder()
{
static HebrewDecoder* decoder = nullptr;
if (!decoder)
decoder = new HebrewDecoder;
return *decoder;
}
CyrillicDecoder& cyrillic_decoder()
{
static CyrillicDecoder* decoder = nullptr;
if (!decoder)
decoder = new CyrillicDecoder;
return *decoder;
}
Koi8RDecoder& koi8r_decoder()
{
static Koi8RDecoder* decoder = nullptr;
if (!decoder)
decoder = new Koi8RDecoder;
return *decoder;
}
Latin9Decoder& latin9_decoder()
{
static Latin9Decoder* decoder = nullptr;
if (!decoder)
decoder = new Latin9Decoder;
return *decoder;
}
TurkishDecoder& turkish_decoder()
{
static TurkishDecoder* decoder = nullptr;
if (!decoder)
decoder = new TurkishDecoder;
return *decoder;
}
Latin1Decoder s_latin1_decoder;
UTF8Decoder s_utf8_decoder;
UTF16BEDecoder s_utf16be_decoder;
Latin2Decoder s_latin2_decoder;
HebrewDecoder s_hebrew_decoder;
CyrillicDecoder s_cyrillic_decoder;
Koi8RDecoder s_koi8r_decoder;
Latin9Decoder s_latin9_decoder;
TurkishDecoder s_turkish_decoder;
}
Decoder* decoder_for(const String& a_encoding)
@ -90,23 +27,23 @@ Decoder* decoder_for(const String& a_encoding)
auto encoding = get_standardized_encoding(a_encoding);
if (encoding.has_value()) {
if (encoding.value().equals_ignoring_case("windows-1252"))
return &latin1_decoder();
return &s_latin1_decoder;
if (encoding.value().equals_ignoring_case("utf-8"))
return &utf8_decoder();
return &s_utf8_decoder;
if (encoding.value().equals_ignoring_case("utf-16be"))
return &utf16be_decoder();
return &s_utf16be_decoder;
if (encoding.value().equals_ignoring_case("iso-8859-2"))
return &latin2_decoder();
return &s_latin2_decoder;
if (encoding.value().equals_ignoring_case("windows-1255"))
return &hebrew_decoder();
return &s_hebrew_decoder;
if (encoding.value().equals_ignoring_case("windows-1251"))
return &cyrillic_decoder();
return &s_cyrillic_decoder;
if (encoding.value().equals_ignoring_case("koi8-r"))
return &koi8r_decoder();
return &s_koi8r_decoder;
if (encoding.value().equals_ignoring_case("iso-8859-15"))
return &latin9_decoder();
return &s_latin9_decoder;
if (encoding.value().equals_ignoring_case("windows-1254"))
return &turkish_decoder();
return &s_turkish_decoder;
}
dbgln("TextCodec: No decoder implemented for encoding '{}'", a_encoding);
return nullptr;