# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1202367956 28800
# Node ID a8b772313ff4065f08014001346a6840687052cf
# Parent  de3753c3160a6b78f65b74399af7becf5e0f49dd
fixup debug messages #llx rather than #x, fix 7c block documentation to match code

diff -r de3753c3160a -r a8b772313ff4 src/libpst.c
--- a/src/libpst.c	Sat Feb 02 12:54:07 2008 -0800
+++ b/src/libpst.c	Wed Feb 06 23:05:56 2008 -0800
@@ -1496,7 +1496,7 @@
         }
 
         if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset5)) {
-            DEBUG_WARN(("internal error (7c.5b.desc offset %#x) in reading block id %#llx\n", table_rec.value, block_id));
+            DEBUG_WARN(("internal error (7c.b5.desc offset %#x) in reading block id %#llx\n", table_rec.value, block_id));
             freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7);
             DEBUG_RET();
             return NULL;
@@ -4143,7 +4143,7 @@
 size_t pst_read_block_size(pst_file *pf, off_t offset, size_t size, char **buf) {
     size_t rsize;
     DEBUG_ENT("pst_read_block_size");
-    DEBUG_READ(("Reading block from %#x, %i bytes\n", offset, size));
+    DEBUG_READ(("Reading block from %#llx, %x bytes\n", offset, size));
 
     if (*buf) {
         DEBUG_READ(("Freeing old memory\n"));
@@ -4155,7 +4155,7 @@
     if (rsize != size) {
         DEBUG_WARN(("Didn't read all the data. fread returned less [%i instead of %i]\n", rsize, size));
         if (feof(pf->fp)) {
-            DEBUG_WARN(("We tried to read past the end of the file at [offset %#x, size %#x]\n", offset, size));
+            DEBUG_WARN(("We tried to read past the end of the file at [offset %#llx, size %#x]\n", offset, size));
         } else if (ferror(pf->fp)) {
             DEBUG_WARN(("Error is set on file stream.\n"));
         } else {
diff -r de3753c3160a -r a8b772313ff4 xml/libpst.in
--- a/xml/libpst.in	Sat Feb 02 12:54:07 2008 -0800
+++ b/xml/libpst.in	Wed Feb 06 23:05:56 2008 -0800
@@ -1775,7 +1775,6 @@
 0008  recordSize      [2 bytes] 0x0065     in this case
 000a  b5Offset        [4 bytes] 0x0020     index reference
 000e  index2Offset    [4 bytes] 0x0080     index reference
-0010  unknown         [2 bytes] 0x0000     in this case
 0012  unknown         [2 bytes] 0x0000     in this case
 0014  unknown         [2 bytes] 0x0000     in this case
 ]]></literallayout>