git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
let the user explicitly choose ruby and rake programs
[libguestfs.git]
/
src
/
dbdump.c
diff --git
a/src/dbdump.c
b/src/dbdump.c
index
f9d06aa
..
45c67c6
100644
(file)
--- a/
src/dbdump.c
+++ b/
src/dbdump.c
@@
-29,9
+29,7
@@
#include <errno.h>
#include <endian.h>
#include <errno.h>
#include <endian.h>
-#ifdef HAVE_PCRE
#include <pcre.h>
#include <pcre.h>
-#endif
#ifdef HAVE_HIVEX
#include <hivex.h>
#ifdef HAVE_HIVEX
#include <hivex.h>
@@
-43,7
+41,7
@@
#include "guestfs.h"
#include "guestfs-internal.h"
#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);
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. */
}
/* Catch errors from the db_dump command. */
- if (pclose (pp)
== -1
) {
+ if (pclose (pp)
!= 0
) {
perrorf (g, "pclose: %s", cmd);
goto out;
}
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;
}
return bin;
}
-#endif /* defined(HAVE_
PCRE) && defined(HAVE_
HIVEX) && defined(DB_DUMP) */
+#endif /* defined(HAVE_HIVEX) && defined(DB_DUMP) */