summaryrefslogtreecommitdiff
path: root/Kernel
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-02-17 16:37:11 +0100
committerAndreas Kling <kling@serenityos.org>2021-02-17 16:37:11 +0100
commit6c2f0316d97d22bae876cdc14f750d416d83e61a (patch)
tree6a80a709d7fcf2cb57fbc4552a6f9322eddb90d2 /Kernel
parent5f610417d028d7d25169709cfc395aa673cbf78c (diff)
downloadserenity-6c2f0316d97d22bae876cdc14f750d416d83e61a.zip
Kernel: Convert snprintf() => String::formatted()/number()
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/FileSystem/ProcFS.cpp12
-rw-r--r--Kernel/TTY/SlavePTY.cpp2
-rw-r--r--Kernel/TTY/SlavePTY.h2
3 files changed, 5 insertions, 11 deletions
diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp
index ec07b6a4fa..e98154094b 100644
--- a/Kernel/FileSystem/ProcFS.cpp
+++ b/Kernel/FileSystem/ProcFS.cpp
@@ -1260,9 +1260,7 @@ KResult ProcFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntr
callback({ { entry.name, strlen(entry.name) }, to_identifier(fsid(), PDI_Root, 0, (ProcFileType)entry.proc_file_type), 0 });
}
for (auto pid_child : Process::all_pids()) {
- char name[16];
- size_t name_length = (size_t)snprintf(name, sizeof(name), "%d", pid_child.value());
- callback({ { name, name_length }, to_identifier(fsid(), PDI_Root, pid_child, FI_PID), 0 });
+ callback({ String::number(pid_child.value()), to_identifier(fsid(), PDI_Root, pid_child, FI_PID), 0 });
}
break;
@@ -1305,9 +1303,7 @@ KResult ProcFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntr
auto description = process->file_description(i);
if (!description)
continue;
- char name[16];
- size_t name_length = (size_t)snprintf(name, sizeof(name), "%d", i);
- callback({ { name, name_length }, to_identifier_with_fd(fsid(), pid, i), 0 });
+ callback({ String::number(i), to_identifier_with_fd(fsid(), pid, i), 0 });
}
} break;
@@ -1318,9 +1314,7 @@ KResult ProcFSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntr
return ENOENT;
process->for_each_thread([&](Thread& thread) -> IterationDecision {
int tid = thread.tid().value();
- char name[16];
- size_t name_length = (size_t)snprintf(name, sizeof(name), "%d", tid);
- callback({ { name, name_length }, to_identifier_with_stack(fsid(), tid), 0 });
+ callback({ String::number(tid), to_identifier_with_stack(fsid(), tid), 0 });
return IterationDecision::Continue;
});
} break;
diff --git a/Kernel/TTY/SlavePTY.cpp b/Kernel/TTY/SlavePTY.cpp
index 5cc09eaa9a..cb5c707d31 100644
--- a/Kernel/TTY/SlavePTY.cpp
+++ b/Kernel/TTY/SlavePTY.cpp
@@ -37,7 +37,7 @@ SlavePTY::SlavePTY(MasterPTY& master, unsigned index)
, m_master(master)
, m_index(index)
{
- snprintf(m_tty_name, sizeof(m_tty_name), "/dev/pts/%u", m_index);
+ m_tty_name = String::formatted("/dev/pts/{}", m_index);
auto process = Process::current();
set_uid(process->uid());
set_gid(process->gid());
diff --git a/Kernel/TTY/SlavePTY.h b/Kernel/TTY/SlavePTY.h
index fc9c46311f..4fd889ed9b 100644
--- a/Kernel/TTY/SlavePTY.h
+++ b/Kernel/TTY/SlavePTY.h
@@ -66,7 +66,7 @@ private:
RefPtr<MasterPTY> m_master;
time_t m_time_of_last_write { 0 };
unsigned m_index { 0 };
- char m_tty_name[32];
+ String m_tty_name;
};
}