1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 06:34:57 +00:00

AK+Userland: Introduce ByteString::create_and_overwrite

And replace two users of raw StringImpl with it.
This commit is contained in:
Dan Klishch 2024-01-22 13:26:55 -05:00 committed by Andrew Kaster
parent f7c952f842
commit 061f902f95
3 changed files with 28 additions and 12 deletions

View file

@ -394,10 +394,13 @@ hostent* gethostbyaddr(void const* addr, socklen_t addr_size, int type)
return nullptr;
}
char* buffer;
auto string_impl = StringImpl::create_uninitialized(response_header.name_length, buffer);
ssize_t nreceived;
if (auto nreceived = read(fd, buffer, response_header.name_length); nreceived < 0) {
gethostbyaddr_name_buffer = ByteString::create_and_overwrite(response_header.name_length, [&](Bytes bytes) {
nreceived = read(fd, bytes.data(), bytes.size());
});
if (nreceived < 0) {
h_errno = TRY_AGAIN;
return nullptr;
} else if (static_cast<u32>(nreceived) != response_header.name_length) {
@ -405,8 +408,7 @@ hostent* gethostbyaddr(void const* addr, socklen_t addr_size, int type)
return nullptr;
}
gethostbyaddr_name_buffer = move(string_impl);
__gethostbyaddr_buffer.h_name = buffer;
__gethostbyaddr_buffer.h_name = const_cast<char*>(gethostbyaddr_name_buffer.characters());
__gethostbyaddr_alias_list_buffer[0] = nullptr;
__gethostbyaddr_buffer.h_aliases = __gethostbyaddr_alias_list_buffer;
__gethostbyaddr_buffer.h_addrtype = AF_INET;