From f3e267fce28c58039789379ba3488ad12c20a7f6 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 21 Jul 2012 05:48:13 -0400
Subject: Move readToken from QPDF to QPDFTokenizer

---
 libqpdf/QPDF.cc | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'libqpdf/QPDF.cc')

diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 43757735..e1ce5fc4 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -1419,45 +1419,7 @@ QPDF::recoverStreamLength(PointerHolder<InputSource> input,
 QPDFTokenizer::Token
 QPDF::readToken(PointerHolder<InputSource> input)
 {
-    qpdf_offset_t offset = input->tell();
-    QPDFTokenizer::Token token;
-    bool unread_char;
-    char char_to_unread;
-    while (! this->tokenizer.getToken(token, unread_char, char_to_unread))
-    {
-	char ch;
-	if (input->read(&ch, 1) == 0)
-	{
-	    throw QPDFExc(qpdf_e_damaged_pdf, input->getName(),
-			  this->last_object_description, offset,
-			  "EOF while reading token");
-	}
-	else
-	{
-	    if (isspace((unsigned char)ch) &&
-		(input->getLastOffset() == offset))
-	    {
-		++offset;
-	    }
-	    this->tokenizer.presentCharacter(ch);
-	}
-    }
-
-    if (unread_char)
-    {
-	input->unreadCh(char_to_unread);
-    }
-
-    if (token.getType() == QPDFTokenizer::tt_bad)
-    {
-	throw QPDFExc(qpdf_e_damaged_pdf, input->getName(),
-		      this->last_object_description, offset,
-		      token.getErrorMessage());
-    }
-
-    input->setLastOffset(offset);
-
-    return token;
+    return this->tokenizer.readToken(input, this->last_object_description);
 }
 
 QPDFObjectHandle
-- 
cgit v1.2.3-54-g00ecf