X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fdbdump.c;h=45c67c62d5aa8f56607e3b05a48b5fa126ed84f3;hb=8928de32d391e3ad4dd98bb27472c27bb8bc38ac;hp=f9d06aa860fed843e5abf8bf5c13b6a9cf2d847b;hpb=a986e8dadb0c70634f6d1d89dd3e7bb5d9af3078;p=libguestfs.git

diff --git a/src/dbdump.c b/src/dbdump.c
index f9d06aa..45c67c6 100644
--- a/src/dbdump.c
+++ b/src/dbdump.c
@@ -29,9 +29,7 @@
 #include <errno.h>
 #include <endian.h>
 
-#ifdef HAVE_PCRE
 #include <pcre.h>
-#endif
 
 #ifdef HAVE_HIVEX
 #include <hivex.h>
@@ -43,7 +41,7 @@
 #include "guestfs.h"
 #include "guestfs-internal.h"
 
-#if defined(HAVE_PCRE) && defined(HAVE_HIVEX) && defined(DB_DUMP)
+#if defined(HAVE_HIVEX) && defined(DB_DUMP)
 
 static unsigned char *convert_hex_to_binary (guestfs_h *g, const char *hex, size_t hexlen, size_t *binlen_rtn);
 
@@ -131,7 +129,7 @@ guestfs___read_db_dump (guestfs_h *g,
   }
 
   /* Catch errors from the db_dump command. */
-  if (pclose (pp) == -1) {
+  if (pclose (pp) != 0) {
     perrorf (g, "pclose: %s", cmd);
     goto out;
   }
@@ -217,4 +215,4 @@ convert_hex_to_binary (guestfs_h *g, const char *hex, size_t hexlen,
   return bin;
 }
 
-#endif /* defined(HAVE_PCRE) && defined(HAVE_HIVEX) && defined(DB_DUMP) */
+#endif /* defined(HAVE_HIVEX) && defined(DB_DUMP) */