From b417ad4e302b5cc17f88f70b1df777b85d4ee87a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 6 Nov 2014 19:20:19 -0800 Subject: [PATCH] More dump_data_value(). --- dump.c | 53 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/dump.c b/dump.c index 966080b00c..a7d7e0d167 100644 --- a/dump.c +++ b/dump.c @@ -840,43 +840,7 @@ dump_data(void) unsigned int format; double value; - if (match_byte (0x31)) - { - if (match_u32 (0)) - { - if (match_u32 (1)) - get_string(); - else - 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 - { - match_u32_assert(2); - printf("(special 2)"); - match_byte_assert(0); - match_byte_assert(0); - 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_byte_assert (0x58); + dump_data_value_31(); format = get_u32 (); value = get_double (); printf (" value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff); @@ -951,20 +915,7 @@ dump_data(void) unsigned int format; double value; - if (match_byte (0x31)) - { - 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 - match_byte_assert (0x58); + dump_data_value_31(); format = get_u32 (); value = get_double (); printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff); -- 2.30.2