From a9117791e26451dea06a0d9ea831325afe2be16c Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Tue, 5 Aug 2025 19:49:11 +0200 Subject: [PATCH] libutil: remove unused FdSource::specialEndOfFileError Change-Id: Ia03e270c359014ab3675a043bad342c4bbfdbafd --- lix/libutil/serialise.cc | 8 +------- lix/libutil/serialise.hh | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lix/libutil/serialise.cc b/lix/libutil/serialise.cc index aa74ffe3e..c97052422 100644 --- a/lix/libutil/serialise.cc +++ b/lix/libutil/serialise.cc @@ -197,17 +197,11 @@ size_t FdSource::readUnbuffered(char * data, size_t len) throw SysError("reading from file"); } if (n == 0) { - throw EndOfFile(endOfFileError()); + throw EndOfFile("unexpected end-of-file"); } return n; } -std::string FdSource::endOfFileError() const -{ - return specialEndOfFileError.has_value() ? *specialEndOfFileError : "unexpected end-of-file"; -} - - size_t StringSource::read(char * data, size_t len) { if (pos == s.size()) throw EndOfFile("end of string reached"); diff --git a/lix/libutil/serialise.hh b/lix/libutil/serialise.hh index a564330c5..bffedc3f6 100644 --- a/lix/libutil/serialise.hh +++ b/lix/libutil/serialise.hh @@ -152,10 +152,6 @@ private: struct FdSource : BufferedSource { int fd; - /** Defaults to "unexpected end-of-file" */ - std::optional specialEndOfFileError; - - std::string endOfFileError() const; FdSource() : fd(-1) { } FdSource(int fd) : fd(fd) { }