# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1235518376 28800
# Node ID 0695de3b5a9836da3fd38ea1184b1442e98503ca
# Parent  2da75cc458836ccd2e17d11dba877e4870886928
fix for 64bit on Fedora 11

diff -r 2da75cc45883 -r 0695de3b5a98 ChangeLog
--- a/ChangeLog	Tue Feb 24 13:18:46 2009 -0800
+++ b/ChangeLog	Tue Feb 24 15:32:56 2009 -0800
@@ -1,3 +1,7 @@
+LibPST 0.6.29 (2009-02-24)
+===============================
+    * fix for 64bit on Fedora 11
+
 LibPST 0.6.28 (2009-02-24)
 ===============================
     * add X-libpst-forensic-* headers to capture items of interest
diff -r 2da75cc45883 -r 0695de3b5a98 NEWS
--- a/NEWS	Tue Feb 24 13:18:46 2009 -0800
+++ b/NEWS	Tue Feb 24 15:32:56 2009 -0800
@@ -1,3 +1,4 @@
+0.6.29  2009-02-24 fix for 64bit on Fedora 11
 0.6.28  2009-02-24 improve decoding of multipart/report and message/rfc822 mime types.
 0.6.27  2009-02-07 fix for const correctness on Fedora 11
 0.6.26  2009-02-07 patch from Fridrich Strba for building on mingw, and autoconf cleanup, better mime headers
diff -r 2da75cc45883 -r 0695de3b5a98 configure.in
--- a/configure.in	Tue Feb 24 13:18:46 2009 -0800
+++ b/configure.in	Tue Feb 24 15:32:56 2009 -0800
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(libpst,0.6.28,carl@five-ten-sg.com)
+AC_INIT(libpst,0.6.29,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([src/libpst.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
diff -r 2da75cc45883 -r 0695de3b5a98 libpst.spec.in
--- a/libpst.spec.in	Tue Feb 24 13:18:46 2009 -0800
+++ b/libpst.spec.in	Tue Feb 24 15:32:56 2009 -0800
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Feb 24 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.29-1
+- fix for 64bit on Fedora 11
+
 * Tue Feb 24 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.28-1
 - improve decoding of multipart/report and message/rfc822 mime types.
 - improve character set handling.
diff -r 2da75cc45883 -r 0695de3b5a98 src/getidblock.c
--- a/src/getidblock.c	Tue Feb 24 13:18:46 2009 -0800
+++ b/src/getidblock.c	Tue Feb 24 15:32:56 2009 -0800
@@ -36,13 +36,13 @@
             DIE(("Error decrypting block\n"));
         }
 
-    DEBUG_MAIN(("Printing block id %#"PRIx64", size %#x\n", id, readSize));
+    DEBUG_MAIN(("Printing block id %#"PRIx64", size %#"PRIx64"\n", id, (uint64_t)readSize));
     if (binary) {
         if (fwrite(buf, 1, readSize, stdout) != 0) {
             DIE(("Error occured during writing of buf to stdout\n"));
         }
     } else {
-        printf("Block id %#"PRIx64", size %#x\n", id, readSize);
+        printf("Block id %#"PRIx64", size %#"PRIx64"\n", id, (uint64_t)readSize);
         pst_debug_hexdumper(stdout, buf, readSize, 0x10, 0);
     }
     if (buf) free(buf);
diff -r 2da75cc45883 -r 0695de3b5a98 src/pst2dii.cpp.in
--- a/src/pst2dii.cpp.in	Tue Feb 24 13:18:46 2009 -0800
+++ b/src/pst2dii.cpp.in	Tue Feb 24 15:32:56 2009 -0800
@@ -384,7 +384,7 @@
 {
     close_png();
     conversion += string(" ") + pdf_name;
-    system(conversion.c_str());
+    (void)system(conversion.c_str());
     for (vector<string>::iterator i=png_names.begin(); i!=png_names.end(); i++) {
         remove((*i).c_str());
     }
@@ -562,7 +562,9 @@
         removeCR(item->email->htmlbody);
         print_pdf(item->email->htmlbody);
     } else if (item->email->encrypted_body || item->email->encrypted_htmlbody) {
-        print_pdf("The body of this email is encrypted. This isn't supported yet, but the body is now an attachment\n");
+        char ln[LINE_SIZE];
+        snprintf(ln, sizeof(ln), "%s", "The body of this email is encrypted. This isn't supported yet, but the body is now an attachment\n");
+        print_pdf(ln);
     }
     fprintf(dii_file, "@EMAIL-END\n");
 
diff -r 2da75cc45883 -r 0695de3b5a98 src/readpst.c
--- a/src/readpst.c	Tue Feb 24 13:18:46 2009 -0800
+++ b/src/readpst.c	Tue Feb 24 15:32:56 2009 -0800
@@ -752,7 +752,7 @@
     d_ptr.parent_id  = 0;
     d_ptr.list_index = NULL;
     d_ptr.desc       = ptr;
-    d_ptr.no_child   - 0;
+    d_ptr.no_child   = 0;
     d_ptr.prev       = NULL;
     d_ptr.next       = NULL;
     d_ptr.parent     = NULL;
@@ -884,7 +884,6 @@
 
 void header_strip_field(char *header, char *field)
 {
-    char *e;
     char *t = header_get_field(header, field);
     if (t) {
         char *e = header_end_field(t);
@@ -959,7 +958,7 @@
     char *headers = *extra_mime_headers;
     if (headers) {
         char *temp, *t;
-        while (temp = strstr(headers, "\n\n")) {
+        while ((temp = strstr(headers, "\n\n"))) {
             temp[1] = '\0';
             t = header_get_field(headers, "\nContent-Type: ");
             if (t) {