diff options
author | Andreas Kling <kling@serenityos.org> | 2021-01-30 09:29:51 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-01-30 09:29:51 +0100 |
commit | 5b37c0a71ad7a2bbcfe9f73ac1f0305abd133d8c (patch) | |
tree | cf5f86916bec575a998e50b0726f2d3fb34c055c /Userland | |
parent | ec91f8ad1d569b09ec5a222544b9064b33441e7a (diff) | |
download | serenity-5b37c0a71ad7a2bbcfe9f73ac1f0305abd133d8c.zip |
LibC: Convert remaining String::format() to formatted()/number()
Diffstat (limited to 'Userland')
-rw-r--r-- | Userland/Libraries/LibC/dlfcn.cpp | 8 | ||||
-rw-r--r-- | Userland/Libraries/LibC/netdb.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibC/termcap.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibC/unistd.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Userland/Libraries/LibC/dlfcn.cpp b/Userland/Libraries/LibC/dlfcn.cpp index f15fd2807b..5bbbaaacda 100644 --- a/Userland/Libraries/LibC/dlfcn.cpp +++ b/Userland/Libraries/LibC/dlfcn.cpp @@ -79,7 +79,7 @@ void* dlopen(const char* filename, int flags) int fd = open(filename, O_RDONLY); 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; } @@ -90,21 +90,21 @@ void* dlopen(const char* filename, int flags) int ret = fstat(fd, &file_stats); 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; } auto loader = ELF::DynamicLoader::construct(filename, fd, file_stats.st_size); 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; } if (!loader->load_from_image(flags, 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; } diff --git a/Userland/Libraries/LibC/netdb.cpp b/Userland/Libraries/LibC/netdb.cpp index 6f0af1bf68..d64bde52b6 100644 --- a/Userland/Libraries/LibC/netdb.cpp +++ b/Userland/Libraries/LibC/netdb.cpp @@ -123,7 +123,7 @@ hostent* gethostbyname(const char* name) 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()); if (nsent < 0) { 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); - 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[2], ipv4_address[1], diff --git a/Userland/Libraries/LibC/termcap.cpp b/Userland/Libraries/LibC/termcap.cpp index ef0b847f5c..034663af9f 100644 --- a/Userland/Libraries/LibC/termcap.cpp +++ b/Userland/Libraries/LibC/termcap.cpp @@ -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) { auto cap_str = String(cap); - cap_str.replace("%p1%d", String::format("%d", col)); - cap_str.replace("%p2%d", String::format("%d", row)); + cap_str.replace("%p1%d", String::number(col)); + cap_str.replace("%p2%d", String::number(row)); s_tgoto_buffer.clear_with_capacity(); s_tgoto_buffer.ensure_capacity(cap_str.length()); diff --git a/Userland/Libraries/LibC/unistd.cpp b/Userland/Libraries/LibC/unistd.cpp index 0cb18dea8b..b87220f25d 100644 --- a/Userland/Libraries/LibC/unistd.cpp +++ b/Userland/Libraries/LibC/unistd.cpp @@ -129,7 +129,7 @@ int execvpe(const char* filename, char* const argv[], char* const envp[]) path = "/bin:/usr/bin"; auto parts = path.split(':'); 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); if (rc < 0 && errno != ENOENT) { errno_rollback.set_override_rollback_value(errno); |