mirror of
https://github.com/RGBCube/serenity
synced 2025-05-28 14:05:09 +00:00
LibC: Convert remaining String::format() to formatted()/number()
This commit is contained in:
parent
ec91f8ad1d
commit
5b37c0a71a
4 changed files with 9 additions and 9 deletions
|
@ -79,7 +79,7 @@ void* dlopen(const char* filename, int flags)
|
||||||
|
|
||||||
int fd = open(filename, O_RDONLY);
|
int fd = open(filename, O_RDONLY);
|
||||||
if (!fd) {
|
if (!fd) {
|
||||||
g_dlerror_msg = String::format("Unable to open file %s", filename);
|
g_dlerror_msg = String::formatted("Unable to open file {}", filename);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,21 +90,21 @@ void* dlopen(const char* filename, int flags)
|
||||||
|
|
||||||
int ret = fstat(fd, &file_stats);
|
int ret = fstat(fd, &file_stats);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
g_dlerror_msg = String::format("Unable to stat file %s", filename);
|
g_dlerror_msg = String::formatted("Unable to stat file {}", filename);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto loader = ELF::DynamicLoader::construct(filename, fd, file_stats.st_size);
|
auto loader = ELF::DynamicLoader::construct(filename, fd, file_stats.st_size);
|
||||||
|
|
||||||
if (!loader->is_valid()) {
|
if (!loader->is_valid()) {
|
||||||
g_dlerror_msg = String::format("%s is not a valid ELF dynamic shared object!", filename);
|
g_dlerror_msg = String::formatted("{} is not a valid ELF dynamic shared object!", filename);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!loader->load_from_image(flags,
|
if (!loader->load_from_image(flags,
|
||||||
0 // total_tls_size = 0, FIXME: Support TLS when using dlopen()
|
0 // total_tls_size = 0, FIXME: Support TLS when using dlopen()
|
||||||
)) {
|
)) {
|
||||||
g_dlerror_msg = String::format("Failed to load ELF object %s", filename);
|
g_dlerror_msg = String::formatted("Failed to load ELF object {}", filename);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,7 @@ hostent* gethostbyname(const char* name)
|
||||||
close(fd);
|
close(fd);
|
||||||
});
|
});
|
||||||
|
|
||||||
auto line = String::format("L%s\n", name);
|
auto line = String::formatted("L{}\n", name);
|
||||||
int nsent = write(fd, line.characters(), line.length());
|
int nsent = write(fd, line.characters(), line.length());
|
||||||
if (nsent < 0) {
|
if (nsent < 0) {
|
||||||
perror("write");
|
perror("write");
|
||||||
|
@ -189,7 +189,7 @@ hostent* gethostbyaddr(const void* addr, socklen_t addr_size, int type)
|
||||||
|
|
||||||
IPv4Address ipv4_address((const u8*)&((const in_addr*)addr)->s_addr);
|
IPv4Address ipv4_address((const u8*)&((const in_addr*)addr)->s_addr);
|
||||||
|
|
||||||
auto line = String::format("R%d.%d.%d.%d.in-addr.arpa\n",
|
auto line = String::formatted("R{}.{}.{}.{}.in-addr.arpa\n",
|
||||||
ipv4_address[3],
|
ipv4_address[3],
|
||||||
ipv4_address[2],
|
ipv4_address[2],
|
||||||
ipv4_address[1],
|
ipv4_address[1],
|
||||||
|
|
|
@ -144,8 +144,8 @@ static Vector<char> s_tgoto_buffer;
|
||||||
char* tgoto([[maybe_unused]] const char* cap, [[maybe_unused]] int col, [[maybe_unused]] int row)
|
char* tgoto([[maybe_unused]] const char* cap, [[maybe_unused]] int col, [[maybe_unused]] int row)
|
||||||
{
|
{
|
||||||
auto cap_str = String(cap);
|
auto cap_str = String(cap);
|
||||||
cap_str.replace("%p1%d", String::format("%d", col));
|
cap_str.replace("%p1%d", String::number(col));
|
||||||
cap_str.replace("%p2%d", String::format("%d", row));
|
cap_str.replace("%p2%d", String::number(row));
|
||||||
|
|
||||||
s_tgoto_buffer.clear_with_capacity();
|
s_tgoto_buffer.clear_with_capacity();
|
||||||
s_tgoto_buffer.ensure_capacity(cap_str.length());
|
s_tgoto_buffer.ensure_capacity(cap_str.length());
|
||||||
|
|
|
@ -129,7 +129,7 @@ int execvpe(const char* filename, char* const argv[], char* const envp[])
|
||||||
path = "/bin:/usr/bin";
|
path = "/bin:/usr/bin";
|
||||||
auto parts = path.split(':');
|
auto parts = path.split(':');
|
||||||
for (auto& part : parts) {
|
for (auto& part : parts) {
|
||||||
auto candidate = String::format("%s/%s", part.characters(), filename);
|
auto candidate = String::formatted("{}/{}", part, filename);
|
||||||
int rc = execve(candidate.characters(), argv, envp);
|
int rc = execve(candidate.characters(), argv, envp);
|
||||||
if (rc < 0 && errno != ENOENT) {
|
if (rc < 0 && errno != ENOENT) {
|
||||||
errno_rollback.set_override_rollback_value(errno);
|
errno_rollback.set_override_rollback_value(errno);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue