From ae3f2dabdd7e8c8c5e0c5e13d3400d93b5a3e45d Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Wed, 10 Feb 2021 18:37:17 +0100
Subject: [PATCH] [Kernel] minor audit fixes following review
---
src/kernel_services/ast_queries/file.ml | 5 +++--
src/kernel_services/plugin_entry_points/kernel.ml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/kernel_services/ast_queries/file.ml b/src/kernel_services/ast_queries/file.ml
index 63f07080b6a..3d5d0970665 100644
--- a/src/kernel_services/ast_queries/file.ml
+++ b/src/kernel_services/ast_queries/file.ml
@@ -1754,8 +1754,9 @@ let prepare_from_c_files () =
if not (Filepath.Normalized.is_unknown audit_path) then begin
let all_sources_tbl = compute_sources_table cpp_commands in
print_all_sources audit_path all_sources_tbl;
- Kernel.feedback "Audit: sources list written to: %a@."
- Filepath.Normalized.pretty audit_path;
+ if not (Filepath.Normalized.is_special_stdout audit_path) then
+ Kernel.feedback "Audit: sources list written to: %a@."
+ Filepath.Normalized.pretty audit_path;
end;
let cil, cabs_files = files_to_cabs_cil files cpp_commands in
prepare_cil_file cil;
diff --git a/src/kernel_services/plugin_entry_points/kernel.ml b/src/kernel_services/plugin_entry_points/kernel.ml
index 29233769c6a..e21274bd4b3 100644
--- a/src/kernel_services/plugin_entry_points/kernel.ml
+++ b/src/kernel_services/plugin_entry_points/kernel.ml
@@ -1071,7 +1071,7 @@ module AuditCheck =
let existence = Filepath.Must_exist
let file_kind = "json"
let help = "reads an audit JSON file (produced by -audit-prepare) and \
- checks compliance w.r.t. to it; e.g., if the source files \
+ checks compliance w.r.t. it; e.g., if the source files \
were declared and have the expected checksum. \
Raises a warning (with warning key 'audit') in case of \
failed checks. \
--
GitLab