
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
40 lines
1 KiB
C
40 lines
1 KiB
C
/*
|
|
* Copyright (c) 2021, Gunnar Beutner <gunnar@beutner.name>
|
|
* Copyright (c) 2022, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/ByteString.h>
|
|
#include <AK/Result.h>
|
|
|
|
struct DlErrorMessage {
|
|
DlErrorMessage(ByteString&& other)
|
|
: text(move(other))
|
|
{
|
|
}
|
|
|
|
// The virtual destructor is required because we're passing this
|
|
// struct to the dynamic loader - whose operator delete differs
|
|
// from the one in libc.so
|
|
virtual ~DlErrorMessage() = default;
|
|
|
|
ByteString text;
|
|
};
|
|
|
|
struct __Dl_info;
|
|
typedef struct __Dl_info Dl_info;
|
|
|
|
typedef Result<void, DlErrorMessage> (*DlCloseFunction)(void*);
|
|
typedef Result<void*, DlErrorMessage> (*DlOpenFunction)(char const*, int);
|
|
typedef Result<void*, DlErrorMessage> (*DlSymFunction)(void*, char const*);
|
|
typedef Result<void, DlErrorMessage> (*DlAddrFunction)(void const*, Dl_info*);
|
|
|
|
extern "C" {
|
|
extern DlCloseFunction __dlclose;
|
|
extern DlOpenFunction __dlopen;
|
|
extern DlSymFunction __dlsym;
|
|
extern DlAddrFunction __dladdr;
|
|
}
|