# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1235680957 28800
# Node ID b47d04257b43639417be2feb0fbdaf94edbf75ae
# Parent  369e75d2abb52cf72d3d54154c2c4b86eb227566
64 bit cleanup in debug messages

diff -r 369e75d2abb5 -r b47d04257b43 regression/regression-tests.bash
--- a/regression/regression-tests.bash	Tue Feb 24 15:38:33 2009 -0800
+++ b/regression/regression-tests.bash	Thu Feb 26 12:42:37 2009 -0800
@@ -22,19 +22,24 @@
     rm -rf output$n
     mkdir output$n
     #    ../src/readpst -cv -o output$n $fn >$ba.err 2>&1
+    #           readpst -cv -o output$n -d dumper $fn >$ba.err 2>&1
     $val ../src/readpst -cv -o output$n -d dumper $fn >$ba.err 2>&1
-    #           readpst -cv -o output$n -d dumper $fn >$ba.err 2>&1
          ../src/readpstlog -f I dumper >$ba.log
+
     #$val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'newPerson' -o $fn >$ba.ldif.err 2>&1
-    #$val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'inetOrgPerson' $fn >$ba.ldif2.err 2>&1
-    #     ../src/readpstlog -f I dumper >$ba.log
+    #$val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'inetOrgPerson' $fn >$ba.ldif.err 2>&1
+    #     ../src/readpstlog -f I dumper >$ba.ldif.log
+
+    #../src/getidblock -d -p $fn 0 >$ba.fulldump
+    #../src/readpstlog -f I getidblock.log >$ba.fulldump.log
+
     rm -f dumper
 }
 
 
 
 val="valgrind --leak-check=full"
-val=''
+#val=''
 
 pushd ..
 make || exit
diff -r 369e75d2abb5 -r b47d04257b43 src/libpst.c
--- a/src/libpst.c	Tue Feb 24 15:38:33 2009 -0800
+++ b/src/libpst.c	Thu Feb 26 12:42:37 2009 -0800
@@ -1359,7 +1359,7 @@
         block_type = 1;
 
         if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, block_hdr.offset, &block_offset1)) {
-            DEBUG_WARN(("internal error (bc.b5 offset %#x) in reading block id %#x\n", block_hdr.offset, block_id));
+            DEBUG_WARN(("internal error (bc.b5 offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id));
             freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7);
             DEBUG_RET();
             return NULL;
@@ -1378,7 +1378,7 @@
         }
 
         if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset2)) {
-            DEBUG_WARN(("internal error (bc.b5.desc offset) in reading block id %#x\n", table_rec.value, block_id));
+            DEBUG_WARN(("internal error (bc.b5.desc offset #x) in reading block id %#"PRIx64"\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;
@@ -1392,7 +1392,7 @@
         block_type = 2;
 
         if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, block_hdr.offset, &block_offset3)) {
-            DEBUG_WARN(("internal error (7c.7c offset %#x) in reading block id %#x\n", block_hdr.offset, block_id));
+            DEBUG_WARN(("internal error (7c.7c offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id));
             freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7);
             DEBUG_RET();
             return NULL;
@@ -1422,7 +1422,7 @@
         num_list = (int32_t)(unsigned)seven_c_blk.item_count;
 
         if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, seven_c_blk.b_five_offset, &block_offset4)) {
-            DEBUG_WARN(("internal error (7c.b5 offset %#x) in reading block id %#x\n", seven_c_blk.b_five_offset, block_id));
+            DEBUG_WARN(("internal error (7c.b5 offset %#x) in reading block id %#"PRIx64"\n", seven_c_blk.b_five_offset, block_id));
             freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7);
             DEBUG_RET();
             return NULL;
@@ -1451,7 +1451,7 @@
         num_recs = (block_offset5.to - block_offset5.from) / (4 + table_rec.ref_type);
 
         if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, seven_c_blk.ind2_offset, &block_offset6)) {
-            DEBUG_WARN(("internal error (7c.ind2 offset %#x) in reading block id %#x\n", seven_c_blk.ind2_offset, block_id));
+            DEBUG_WARN(("internal error (7c.ind2 offset %#x) in reading block id %#"PRIx64"\n", seven_c_blk.ind2_offset, block_id));
             freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7);
             DEBUG_RET();
             return NULL;
@@ -3778,10 +3778,10 @@
             tail = i2_ptr;
             if (id2_rec.table2) {
                 if ((i_ptr = pst_getID(pf, id2_rec.table2)) == NULL) {
-                    DEBUG_WARN(("Table2 [%#x] not found\n", id2_rec.table2));
+                    DEBUG_WARN(("Table2 [%#"PRIi64"] not found\n", id2_rec.table2));
                 }
                 else {
-                    DEBUG_INDEX(("Going deeper for table2 [%#x]\n", id2_rec.table2));
+                    DEBUG_INDEX(("Going deeper for table2 [%#"PRIi64"]\n", id2_rec.table2));
                     i2_ptr->child = pst_build_id2(pf, i_ptr);
                 }
             }
@@ -4379,7 +4379,7 @@
     size_t r;
     int noenc = (int)(id & 2);   // disable encryption
     DEBUG_ENT("pst_ff_getIDblock_dec");
-    DEBUG_INDEX(("for id %#x\n", id));
+    DEBUG_INDEX(("for id %#"PRIi64"\n", id));
     r = pst_ff_getIDblock(pf, id, buf);
     if ((pf->encryption) && !(noenc)) {
         (void)pst_decrypt(id, *buf, r, pf->encryption);
@@ -4424,7 +4424,7 @@
     ptr = pst_getID2(id2_head, id2);
 
     if (!ptr) {
-        DEBUG_INDEX(("Cannot find id2 value %#x\n", id2));
+        DEBUG_INDEX(("Cannot find id2 value %#"PRIi64"\n", id2));
         DEBUG_RET();
         return 0;
     }