git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qemu detection: Free up previous qemu help/version strings if they exist.
[libguestfs.git]
/
src
/
inspect_apps.c
diff --git
a/src/inspect_apps.c
b/src/inspect_apps.c
index
83c5e5e
..
ba27247
100644
(file)
--- a/
src/inspect_apps.c
+++ b/
src/inspect_apps.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>
@@
-46,7
+44,7
@@
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
-#if defined(HAVE_
PCRE) && defined(HAVE_
HIVEX)
+#if defined(HAVE_HIVEX)
#ifdef DB_DUMP
static struct guestfs_application_list *list_applications_rpm (guestfs_h *g, struct inspect_fs *fs);
#ifdef DB_DUMP
static struct guestfs_application_list *list_applications_rpm (guestfs_h *g, struct inspect_fs *fs);
@@
-601,12
+599,12
@@
sort_applications (struct guestfs_application_list *apps)
compare_applications);
}
compare_applications);
}
-#else /* no
PCRE or
hivex at compile time */
+#else /* no hivex at compile time */
/* XXX These functions should be in an optgroup. */
#define NOT_IMPL(r) \
/* XXX These functions should be in an optgroup. */
#define NOT_IMPL(r) \
- error (g, _("inspection API not available since this version of libguestfs was compiled without
PCRE or hivex libraries
")); \
+ error (g, _("inspection API not available since this version of libguestfs was compiled without
the hivex library
")); \
return r
struct guestfs_application_list *
return r
struct guestfs_application_list *
@@
-615,4
+613,4
@@
guestfs__inspect_list_applications (guestfs_h *g, const char *root)
NOT_IMPL(NULL);
}
NOT_IMPL(NULL);
}
-#endif /* no
PCRE or
hivex at compile time */
+#endif /* no hivex at compile time */