LibCore+Everywhere: Move SeekMode out of IODevice

This commit is contained in:
Ali Mohammad Pur 2021-05-12 14:01:34 +04:30 committed by Linus Groh
parent a91a49337c
commit 1ae8775a1b
Notes: sideshowbarker 2024-07-18 18:18:30 +09:00
5 changed files with 10 additions and 10 deletions

View file

@ -144,7 +144,7 @@ private:
{
if (m_proc_mem) {
// Seeking to the beginning causes a data refresh!
if (!m_proc_mem->seek(0, Core::File::SeekMode::SetPosition))
if (!m_proc_mem->seek(0, Core::SeekMode::SetPosition))
return false;
} else {
auto proc_memstat = Core::File::construct("/proc/memstat");

View file

@ -63,7 +63,7 @@ public:
return true;
}
bool discard_or_error(size_t count) override { return m_file->seek(count, IODevice::SeekMode::FromCurrentPosition); }
bool discard_or_error(size_t count) override { return m_file->seek(count, SeekMode::FromCurrentPosition); }
bool unreliable_eof() const override { return m_file->eof(); }

View file

@ -44,6 +44,12 @@ enum class OpenMode : unsigned {
MustBeNew = 16,
};
enum class SeekMode {
SetPosition,
FromCurrentPosition,
FromEndPosition,
};
AK_ENUM_BITWISE_OPERATORS(OpenMode)
class IODevice : public Object {
@ -76,12 +82,6 @@ public:
bool can_read() const;
enum class SeekMode {
SetPosition,
FromCurrentPosition,
FromEndPosition,
};
bool seek(i64, SeekMode = SeekMode::SetPosition, off_t* = nullptr);
virtual bool open(OpenMode) = 0;

View file

@ -20,7 +20,7 @@ HashMap<uid_t, String> ProcessStatisticsReader::s_usernames;
Optional<HashMap<pid_t, Core::ProcessStatistics>> ProcessStatisticsReader::get_all(RefPtr<Core::File>& proc_all_file)
{
if (proc_all_file) {
if (!proc_all_file->seek(0, Core::File::SeekMode::SetPosition)) {
if (!proc_all_file->seek(0, Core::SeekMode::SetPosition)) {
fprintf(stderr, "ProcessStatisticsReader: Failed to refresh /proc/all: %s\n", proc_all_file->error_string());
return {};
}

View file

@ -47,7 +47,7 @@ static off_t find_seek_pos(Core::File& file, int wanted_lines)
// Rather than reading the whole file, start at the end and work backwards,
// stopping when we've found the number of lines we want.
off_t pos = 0;
if (!file.seek(0, Core::IODevice::SeekMode::FromEndPosition, &pos)) {
if (!file.seek(0, Core::SeekMode::FromEndPosition, &pos)) {
fprintf(stderr, "Failed to find end of file: %s\n", file.error_string());
return 1;
}