From a0f46ae7d2a495bf490c7455c987e92372ec5024 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 6 Nov 2014 21:03:10 -0800
Subject: [PATCH] Drop dump_title_value_31() in favor of dump_value_31().

---
 dump.c | 65 ++++++----------------------------------------------------
 1 file changed, 6 insertions(+), 59 deletions(-)

diff --git a/dump.c b/dump.c
index e2b1aa0ff6..3f8e8aaa54 100644
--- a/dump.c
+++ b/dump.c
@@ -176,7 +176,8 @@ dump_value_31(void)
           printf("(special 2)");
           match_byte_assert(0);
           match_byte_assert(0);
-          match_u32_assert(1);
+          if (!match_u32 (2))
+            match_u32_assert(1);
           match_byte_assert(0);
           match_byte_assert(0);
           int subn = get_u32 ();
@@ -621,60 +622,6 @@ dump_data(void)
     }
 }
 
-static void
-dump_title_value_31(int level)
-{
-  if (match_byte (0x31))
-    {
-      if (match_u32 (0))
-        {
-          match_u32_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (1))
-        {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else if (match_u32 (2))
-        {
-          printf("(special 2)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          if (!match_u32(2))
-            match_u32_assert(1);
-          match_byte_assert(0);
-          match_byte_assert(0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else
-        {
-          match_u32_assert(3);
-          printf("(special 3)");
-          match_byte_assert(0);
-          match_byte_assert(0);
-          match_byte_assert(1);
-          match_byte_assert(0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes, ", subn);
-          pos += subn;
-          subn = get_u32 ();
-          printf ("nested %d bytes, ", subn);
-          pos += subn;
-        }
-    }
-  else
-    match_byte_assert (0x58);
-}
-
 static void
 dump_title_value(int level)
 {
@@ -689,7 +636,7 @@ dump_title_value(int level)
   if (match_byte (3))
     {
       get_string();
-      dump_title_value_31(level);
+      dump_value_31();
       get_string();
       printf("string \"%s\"", get_string());
       match_byte (0);
@@ -704,7 +651,7 @@ dump_title_value(int level)
     }
   else if (match_byte (5))
     {
-      dump_title_value_31(level);
+      dump_value_31();
       printf ("variable \"%s\"", get_string());
       get_string();
       if (!match_byte(1) && !match_byte(2))
@@ -757,7 +704,7 @@ dump_title_value(int level)
       unsigned int format;
       double value;
 
-      dump_title_value_31(level);
+      dump_value_31();
       format = get_u32 ();
       value = get_double ();
       printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
@@ -769,7 +716,7 @@ dump_title_value(int level)
     }
   else
     {
-      dump_title_value_31(level);
+      dump_value_31();
 
       char *base = get_string();
       int x = get_u32();
-- 
2.30.2