Hilko Bengen
2011-May-13 06:37 UTC
[Libguestfs] [PATCH 1/3] hivex: Remove python bytecode on "make clean"
--- python/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index bc9ce7c..8599863 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -42,4 +42,6 @@ TESTS_ENVIRONMENT = \ TESTS = run-python-tests +CLEANFILES = hivex.pyc + endif -- 1.7.5.1
Hilko Bengen
2011-May-13 06:37 UTC
[Libguestfs] [PATCH 2/3] hivex: Fix install target for systems without native OCaml compiler
>From the build log for hivex (1.2.6-1) on ia64,---- | ocamlfind install \ | -ldconf ignore -destdir /build/buildd-hivex_1.2.6-1-ia64-iqcb38/hivex-1.2.6/debian/tmp/usr/lib/ocaml \ | hivex \ | META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli | Installed /build/buildd-hivex_1.2.6-1-ia64-iqcb38/hivex-1.2.6/debian/tmp/usr/lib/ocaml/hivex/hivex.mli | Installed /build/buildd-hivex_1.2.6-1-ia64-iqcb38/hivex-1.2.6/debian/tmp/usr/lib/ocaml/hivex/hivex.cmi | ocamlfind: *.cmxa: No such file or directory | make[4]: *** [install-data-hook] Error 2 `---- --- ocaml/Makefile.am | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index e61b5db..b97fe37 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -94,7 +94,12 @@ install-data-hook: $(OCAMLFIND) install \ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ hivex \ - META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli + META *.so *.a *.cma *.cmi *.mli +if HAVE_OCAMLOPT + $(OCAMLFIND) install \ + -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ + *.cmx *.cmxa +endif CLEANFILES += $(noinst_DATA) -- 1.7.5.1
Hilko Bengen
2011-May-13 06:37 UTC
[Libguestfs] [PATCH 3/3] hivex: Replace non-portable ENOKEY constant
I believe that "Required key not available" refers to a cryptographic
key which makes no sense here.
hivex_root() checks if the root offset field points to an invalid
position in the hive file and fails if this is not the case. I think
"Bad address" is a good match.
---
lib/hivex.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/hivex.c b/lib/hivex.c
index 7715520..e730547 100644
--- a/lib/hivex.c
+++ b/lib/hivex.c
@@ -559,7 +559,7 @@ hivex_root (hive_h *h)
{
hive_node_h ret = h->rootoffs;
if (!IS_VALID_BLOCK (h, ret)) {
- errno = ENOKEY;
+ errno = EFAULT;
return 0;
}
return ret;
--
1.7.5.1