Fix: value string specified as a BASE_VAL64_STRING in

[metze/wireshark/wip.git] / pcapio.c

diff --git a/pcapio.c b/pcapio.c
index 8fc756629810ef081c1a56e3e07e52309df955d3..01e069cabe5cc36900bd9cd4aabcd4a84e5f6272 100644 (file)
--- a/pcapio.c
+++ b/pcapio.c
@@ -559,10 +559,6 @@ pcapng_write_enhanced_packet_block(FILE* pfile,
                         return FALSE;
                 if (!write_to_file(pfile, (const guint8*)&flags, sizeof(guint32), bytes_written, err))
                         return FALSE;
-                option.type = OPT_ENDOFOPT;
-                option.value_length = 0;
-                if (!write_to_file(pfile, (const guint8*)&option, sizeof(struct option), bytes_written, err))
-                        return FALSE;
         }
         if (options_length != 0) {
                 /* write end of options */
@@ -622,7 +618,7 @@ pcapng_write_interface_statistics_block(FILE* pfile,
          * Subtract difference, in microseconds, between January 1, 1601
          * 00:00:00 UTC and January 1, 1970, 00:00:00 UTC.
          */
-        timestamp -= G_GINT64_CONSTANT(11644473600000000U);
+        timestamp -= G_GUINT64_CONSTANT(11644473600000000);
 #else
         /*
          * Current time, represented as seconds and microseconds since