search for: ccbfdff67

Easy way to parse JSON from a file, without reading it all to string first. --- common/mltools/JSON_parser-c.c | 25 +++++++++++++++++++++++++ common/mltools/JSON_parser.ml | 1 + common/mltools/JSON_parser.mli | 3 +++ common/mltools/JSON_parser_tests.ml | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/common/mltools/JSON_parser-c.c

No need to read the whole file manually. --- builder/simplestreams_parser.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/simplestreams_parser.ml b/builder/simplestreams_parser.ml index ccbfdff67..407eb11fb 100644 --- a/builder/simplestreams_parser.ml +++ b/builder/simplestreams_parser.ml @@ -44,7 +44,7 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = | Some f -> f ) else tmpfile in - json_parser_tree_parse (read_whole_file file) in + json_...

...| 29 ++---- common/mltools/JSON_parser.mli | 25 ++--- common/mltools/JSON_parser_tests.ml | 77 +++++++-------- 7 files changed, 156 insertions(+), 146 deletions(-) diff --git a/builder/simplestreams_parser.ml b/builder/simplestreams_parser.ml index fa5b887ac..ccbfdff67 100644 --- a/builder/simplestreams_parser.ml +++ b/builder/simplestreams_parser.ml @@ -59,7 +59,7 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = error (f_"%s is not a Simple Streams (index) v1.0 JSON file (format: %s)") uri format; - let index = Arr...

v2: - Added back the null value. - Reran the tests. Rich.

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html