From 83fcd38f1fc2aafd6cd2b8c331f94ca481607dd2 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Wed, 5 Dec 2018 19:45:40 +0100
Subject: [PATCH] update to changes in kernel API
---
src/plugins/markdown-report/eva_coverage.ml | 3 ++-
src/plugins/markdown-report/md_gen.ml | 8 +++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/markdown-report/eva_coverage.ml b/src/plugins/markdown-report/eva_coverage.ml
index bcdc1433bbe..70c5f4bc12f 100644
--- a/src/plugins/markdown-report/eva_coverage.ml
+++ b/src/plugins/markdown-report/eva_coverage.ml
@@ -44,7 +44,8 @@ let is_analyzed_function vi =
Cil_datatype.Varinfo.equal
(Kernel_function.get_vi kf)
vi)
- (Globals.FileIndex.get_functions s))
+ (Globals.FileIndex.get_functions
+ (Filepath.Normalized.of_string s)))
(Mdr_params.Stubs.get())) &&
not (List.mem vi.vname
(String.split_on_char ','
diff --git a/src/plugins/markdown-report/md_gen.ml b/src/plugins/markdown-report/md_gen.ml
index 2f74d5565be..3fe132bcf7d 100644
--- a/src/plugins/markdown-report/md_gen.ml
+++ b/src/plugins/markdown-report/md_gen.ml
@@ -92,8 +92,8 @@ let section_stubs env =
List.concat
(List.map
(fun f ->
- let filename = Filepath.normalize f in
- Globals.FileIndex.get_functions ~declarations:false ~filename)
+ let filename = Filepath.Normalized.of_string f in
+ Globals.FileIndex.get_functions ~declarations:false filename)
(Mdr_params.Stubs.get ())
)
in
@@ -294,9 +294,7 @@ let gen_coverage env =
in
header :: content
-let string_of_pos pos =
- Format.asprintf
- "%s:%d" (Filename.basename pos.Lexing.pos_fname) pos.Lexing.pos_lnum
+let string_of_pos pos = Format.asprintf "%a" Filepath.pp_pos pos
let string_of_pos_opt =
function
--
GitLab