Simplify reader byte reading interface

This eliminates eat_byte() and the way it conflates the status of advancing the
source with the current character, which can cause problems with custom sinks.

1 files changed, 3 insertions, 10 deletions

diff --git a/src/reader.h b/src/reader.h
index 69e632e8..9de37f4c 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -122,21 +122,14 @@ peek_byte(SerdReader* reader)
 }
 
 static inline int
-eat_byte(SerdReader* reader)
-{
-	const int        c  = peek_byte(reader);
-	const SerdStatus st = serd_byte_source_advance(&reader->source);
-
-	return st > SERD_FAILURE ? EOF : c;
-}
-
-static inline int
 eat_byte_safe(SerdReader* reader, const int byte)
 {
 	(void)byte;
 
-	const int c = eat_byte(reader);
+	const int c = peek_byte(reader);
 	assert(c == byte);
+
+	serd_byte_source_advance(&reader->source);
 	return c;
 }