Mercurial > libpst

changeset 97:57bc6251f8dd stable-0-6-19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix an installed unpackaged file code cleanup from compiler warnings
author Carl Byington <carl@five-ten-sg.com>
date Sun, 14 Sep 2008 15:55:11 -0700
parents 2e3ec9511166
children e12db0edd80a
files Makefile.am src/libpst.c
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Sun Sep 14 11:56:19 2008 -0700
+++ b/Makefile.am	Sun Sep 14 15:55:11 2008 -0700
@@ -3,8 +3,10 @@
 html_DATA = AUTHORS COPYING ChangeLog NEWS README
 CLEANFILES = xml/libpst xml/Makefile
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpst.pc
+if BUILD_LIBPST_SHARED
+    pkgconfigdir = $(libdir)/pkgconfig
+    pkgconfig_DATA = libpst.pc
+endif
 
 EXTRA_DIST = Doxyfile libpst.html.tar.gz libpst.spec $(wildcard xml/M*) $(wildcard xml/h*) $(wildcard xml/lib*)
 
--- a/src/libpst.c	Sun Sep 14 11:56:19 2008 -0700
+++ b/src/libpst.c	Sun Sep 14 15:55:11 2008 -0700
@@ -291,14 +291,13 @@
     pst_index_ll *ptr;
     pst_holder h = {NULL, fp, 0};
     size_t size = 0;
-    int32_t x;
     DEBUG_ENT("pst_attach_to_file");
     if (attach->id_val != (uint64_t)-1) {
         ptr = pst_getID(pf, attach->id_val);
         if (ptr) {
             // pst_num_array *list = pst_parse_block(pf, ptr->id, NULL, NULL);
             // DEBUG_WARN(("writing file data attachment\n"));
-            // for (x=0; x<list->count_item; x++) {
+            // for (int32_t x=0; x<list->count_item; x++) {
             //     DEBUG_HEXDUMPC(list->items[x]->data, list->items[x]->size, 0x10);
             //     (void)pst_fwrite(list->items[x]->data, (size_t)1, list->items[x]->size, fp);
             // }
@@ -321,7 +320,6 @@
     pst_index_ll *ptr;
     pst_holder h = {NULL, fp, 1};
     size_t size = 0;
-    int32_t x;
     char *c;
     DEBUG_ENT("pst_attach_to_file_base64");
     if (attach->id_val != (uint64_t)-1) {
@@ -329,7 +327,7 @@
         if (ptr) {
             // pst_num_array *list = pst_parse_block(pf, ptr->id, NULL, NULL);
             // DEBUG_WARN(("writing base64 data attachment\n"));
-            // for (x=0; x<list->count_item; x++) {
+            // for (int32_t x=0; x<list->count_item; x++) {
             //     DEBUG_HEXDUMPC(list->items[x]->data, list->items[x]->size, 0x10);
             //     c = base64_encode(list->items[x]->data, list->items[x]->size);
             //     if (c) {
@@ -4451,7 +4449,7 @@
 
 
 size_t pst_ff_compile_ID(pst_file *pf, uint64_t id, pst_holder *h, size_t size) {
-    size_t z, a, b;
+    size_t z, a;
     uint16_t count, y;
     char *buf3 = NULL, *buf2 = NULL, *t;
     char *b_ptr;