similar to: [PATCH] common/mlstdutils: Add chomp function to remove \n from end of strings.

--- common/mlstdutils/std_utils_tests.ml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/mlstdutils/std_utils_tests.ml b/common/mlstdutils/std_utils_tests.ml index 81f512cbf..f7b0247a4 100644 --- a/common/mlstdutils/std_utils_tests.ml +++ b/common/mlstdutils/std_utils_tests.ml @@ -29,6 +29,11 @@ let assert_equal_int = assert_equal ~printer:(fun x -> string_of_int x)

The new module ‘Std_utils’ contains only functions which are pure OCaml and depend only on the OCaml stdlib. Therefore these functions may be used by the generator. The new module is moved to ‘common/mlstdutils’. This also removes the "<stdlib>" hack, and the code which copied the library around. Also ‘Guestfs_config’, ‘Libdir’ and ‘StringMap’ modules are moved since these are

They will be generated by configure. --- mlstdutils/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mlstdutils/Makefile.am b/mlstdutils/Makefile.am index d29255e..2b4aed8 100644 --- a/mlstdutils/Makefile.am +++ b/mlstdutils/Makefile.am @@ -19,9 +19,12 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ $(SOURCES_MLI) \ - $(SOURCES_ML) \ +

They do not contain messages. --- Makefile.am | 1 + po/POTFILES-ml | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4dde5002..46a52ca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,7 @@ po/POTFILES-ml: configure.ac grep -v '^common/mlprogress/' | \ grep -v '^common/mlvisit/' | \ grep -v

Last used in commit fd63d896445260ce83f88e58c0219606f97dca9e (in 2013). --- .gitignore | 1 - common/mlstdutils/Makefile.am | 8 -------- 2 files changed, 9 deletions(-) diff --git a/.gitignore b/.gitignore index 302aa2d81..3aca17f67 100644 --- a/.gitignore +++ b/.gitignore @@ -130,7 +130,6 @@ Makefile.in /common/mlstdutils/.depend /common/mlstdutils/bytes.ml

Prune from the list of sources where to extract messages various sources with no messages: - .pl and .pm files, as they do not contain messages: almost all the .pl files are tests, and the only .pm file is the Perl Sys::Guestfs module, which wraps the XS extension - dummy.c sources; they are empty sources used to build OCaml-only targets using automake - gperf generated sources - C/OCaml

These safe wrappers around Pervasives.open_in and Pervasives.open_out ensure that exceptions escaping cannot leave unclosed files. --- common/mlstdutils/std_utils.ml | 39 ++++++++++++++++++++-------------- common/mlstdutils/std_utils.mli | 12 +++++++++++ common/mltools/tools_utils.ml | 39 +++++++++++++++++----------------- dib/dib.ml | 9 ++++----

Commit bd1c5c9f4dcf38458099db8a0bf4659a07ef055d changed all the code to use Jansson instead of yajl. However it didn't change the OCaml API name (which was still Yajl). This commit changes the module to a neutral name ("JSON_parser") and moves it into common/mltools so it can be used by other tools. This leaves us in a slightly awkward situation of having two JSON-ish OCaml

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As

This safe wrapper around Unix.openfile ensures that exceptions escaping cannot leave unclosed files. There are only a few places in the code where this wrapper can be used currently. There are other occurences of Unix.openfile but they are not suitable for replacement. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 6 ++++++ daemon/devsparts.ml | 5

We defined a number of functions on lists which are not provided by the standard library. As with Char and String, let's extend List to add these new functions to a List pseudo-module (really Std_utils.List, but called List when you ‘open Std_utils’). The initial exported functions are all List functions from OCaml 3.11 + iteri + mapi. We can add other functions as needed. ---

This safe wrapper around Unix.openfile ensures that exceptions escaping cannot leave unclosed files. There are only a few places in the code where this wrapper can be used currently. There are other occurences of Unix.openfile but they are not suitable for replacement. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 6 ++++++ daemon/devsparts.ml |

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

On Thursday, 13 July 2017 16:38:14 CEST Richard W.M. Jones wrote: > Even if ocamlopt is available, always build a bytecode version of > ‘common/mlstdutils’. > > Furthermore, because this library is pure OCaml, we should not be > using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This > doesn't make any difference for native code, but for bytecode it was >

On Wed, Dec 18, 2019 at 11:13:48AM +0100, Pino Toscano wrote: > They do not contain messages. > --- > Makefile.am | 1 + > po/POTFILES-ml | 11 ----------- > 2 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 4dde5002..46a52ca3 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -115,6 +115,7 @@ po/POTFILES-ml:

Followup/fix of commit 61d4891ef48df171a27873efe90aab51a9b711ef. --- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 09ae4ae..e64c899 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -311,7 +311,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f

Pervasives is deprecated since Ocaml 4.08 and has been removed in OCaml 5.0. https://github.com/ocaml/ocaml/pull/1605 --- mlstdutils/std_utils.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mlstdutils/std_utils.ml b/mlstdutils/std_utils.ml index 0d2fa22..86b21a7 100644 --- a/mlstdutils/std_utils.ml +++ b/mlstdutils/std_utils.ml @@ -341,12 +341,12 @@ module List =

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.