summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2013-06-13 15:28:15 +0100
committerRobin Watts <robin.watts@artifex.com>2013-06-13 15:29:40 +0100
commite74be383f23c8a35f5900b0de113035489fc212c (patch)
tree86ad8835b8892798fc358cbd6786640a3930a520
parent919bc6d91961caac1f1e4aeb95fb581f778a5542 (diff)
downloadmupdf-e74be383f23c8a35f5900b0de113035489fc212c.tar.xz
Remove stray code from last commit.
When creating the previous commit, I considered an alternative way of working. While we didn't use this in the end, I forgot to remove it from the code before committing. Stripping it out here. Sorry.
-rw-r--r--pdf/mupdf-internal.h1
-rw-r--r--pdf/pdf_lex.c23
2 files changed, 2 insertions, 22 deletions
diff --git a/pdf/mupdf-internal.h b/pdf/mupdf-internal.h
index f6791335..95931352 100644
--- a/pdf/mupdf-internal.h
+++ b/pdf/mupdf-internal.h
@@ -58,7 +58,6 @@ void pdf_lexbuf_fin(pdf_lexbuf *lexbuf);
ptrdiff_t pdf_lexbuf_grow(pdf_lexbuf *lexbuf);
pdf_token pdf_lex(fz_stream *f, pdf_lexbuf *lexbuf);
-pdf_token pdf_lex_repair(fz_stream *f, pdf_lexbuf *buf);
pdf_obj *pdf_parse_array(pdf_document *doc, fz_stream *f, pdf_lexbuf *buf);
pdf_obj *pdf_parse_dict(pdf_document *doc, fz_stream *f, pdf_lexbuf *buf);
diff --git a/pdf/pdf_lex.c b/pdf/pdf_lex.c
index 8e179042..30d18ea7 100644
--- a/pdf/pdf_lex.c
+++ b/pdf/pdf_lex.c
@@ -442,8 +442,8 @@ ptrdiff_t pdf_lexbuf_grow(pdf_lexbuf *lb)
return lb->scratch - old;
}
-static pdf_token
-do_lex(fz_stream *f, pdf_lexbuf *buf, int repair)
+pdf_token
+pdf_lex(fz_stream *f, pdf_lexbuf *buf)
{
while (1)
{
@@ -495,13 +495,6 @@ do_lex(fz_stream *f, pdf_lexbuf *buf, int repair)
case '}':
return PDF_TOK_CLOSE_BRACE;
case IS_NUMBER:
- /* In the 'repair' case, we want to stop before
- * consuming the int. */
- if (repair)
- {
- fz_unread_byte(f);
- return PDF_TOK_INT;
- }
return lex_number(f, buf, c);
default: /* isregular: !isdelim && !iswhite && c != EOF */
fz_unread_byte(f);
@@ -511,18 +504,6 @@ do_lex(fz_stream *f, pdf_lexbuf *buf, int repair)
}
}
-pdf_token
-pdf_lex(fz_stream *f, pdf_lexbuf *buf)
-{
- return do_lex(f, buf, 0);
-}
-
-pdf_token
-pdf_lex_repair(fz_stream *f, pdf_lexbuf *buf)
-{
- return do_lex(f, buf, 1);
-}
-
void pdf_print_token(fz_context *ctx, fz_buffer *fzbuf, int tok, pdf_lexbuf *buf)
{
switch (tok)