[Pkg-ocaml-maint-commits] [frama-c] 16/20: Update patch 0001-Fix-spelling-error-in-binary.patch
Mehdi Dogguy
mehdi at moszumanska.debian.org
Wed Dec 21 10:15:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository frama-c.
commit dce07557ca741100d2f7bb7b3ce41fdd2311253a
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Mon Dec 12 23:46:08 2016 +0100
Update patch 0001-Fix-spelling-error-in-binary.patch
---
.../0001-Fix-spelling-error-in-binary.patch | 206 +++++++++++++++++++--
1 file changed, 193 insertions(+), 13 deletions(-)
diff --git a/debian/patches/0001-Fix-spelling-error-in-binary.patch b/debian/patches/0001-Fix-spelling-error-in-binary.patch
index 83bec16..bb43169 100644
--- a/debian/patches/0001-Fix-spelling-error-in-binary.patch
+++ b/debian/patches/0001-Fix-spelling-error-in-binary.patch
@@ -3,20 +3,52 @@ Date: Thu, 21 Jan 2016 23:48:35 +0100
Subject: Fix spelling-error-in-binary
---
- src/kernel_internals/typing/asm_contracts.ml | 2 +-
- src/kernel_services/abstract_interp/lmap_sig.mli | 2 +-
- src/kernel_services/analysis/exn_flow.ml | 2 +-
- src/kernel_services/analysis/logic_interp.ml | 14 +++++++-------
- src/kernel_services/ast_queries/file.ml | 2 +-
- src/kernel_services/ast_queries/logic_typing.ml | 2 +-
- src/libraries/utils/bitvector.ml | 2 +-
- src/plugins/aorai/aorai_utils.ml | 2 +-
- src/plugins/occurrence/register.ml | 2 +-
- src/plugins/value_types/cvalue.ml | 2 +-
- src/plugins/wp/VC.mli | 2 +-
- src/plugins/wp/qed/src/logic.mli | 2 +-
- 12 files changed, 18 insertions(+), 18 deletions(-)
+ man/frama-c.1 | 4 ++--
+ src/kernel_internals/typing/asm_contracts.ml | 2 +-
+ src/kernel_services/abstract_interp/lmap_sig.mli | 2 +-
+ src/kernel_services/analysis/exn_flow.ml | 2 +-
+ src/kernel_services/analysis/logic_interp.ml | 14 +++++++-------
+ src/kernel_services/ast_queries/file.ml | 2 +-
+ src/kernel_services/ast_queries/logic_const.mli | 2 +-
+ src/kernel_services/ast_queries/logic_env.ml | 4 ++--
+ src/kernel_services/ast_queries/logic_typing.ml | 2 +-
+ src/kernel_services/plugin_entry_points/kernel.ml | 2 +-
+ src/libraries/utils/bitvector.ml | 2 +-
+ src/plugins/aorai/aorai_utils.ml | 2 +-
+ src/plugins/occurrence/register.ml | 2 +-
+ src/plugins/scope/dpds_gui.ml | 2 +-
+ .../security_slicing/security_slicing_parameters.ml | 2 +-
+ src/plugins/slicing/fct_slice.ml | 4 ++--
+ src/plugins/value/gui_files/register_gui.ml | 2 +-
+ src/plugins/value/value_parameters.ml | 2 +-
+ src/plugins/value_types/cvalue.ml | 2 +-
+ src/plugins/wp/VC.mli | 2 +-
+ src/plugins/wp/qed/src/logic.mli | 2 +-
+ src/plugins/wp/wpAnnot.ml | 2 +-
+ src/plugins/wp/wp_parameters.ml | 2 +-
+ 23 files changed, 32 insertions(+), 32 deletions(-)
+diff --git a/man/frama-c.1 b/man/frama-c.1
+index 67f47d2..9eccab8 100644
+--- a/man/frama-c.1
++++ b/man/frama-c.1
+@@ -389,14 +389,14 @@ alias of
+ .TP
+ .B -print-plugin-path
+ outputs the directory where Frama-C searches its plugins
+-(can be overidden by the
++(can be overridden by the
+ .B FRAMAC_PLUGIN
+ variable and the
+ .B -add-path
+ option)
+ .TP
+ .B -print-share-path
+-outputs the directory where Frama-C stores its data (can be overidden by the
++outputs the directory where Frama-C stores its data (can be overridden by the
+ .B FRAMAC_SHARE
+ variable)
+ .TP
diff --git a/src/kernel_internals/typing/asm_contracts.ml b/src/kernel_internals/typing/asm_contracts.ml
index 3496d74..c30fa22 100644
--- a/src/kernel_internals/typing/asm_contracts.ml
@@ -133,6 +165,41 @@ index af53fad..e5a3a7c 100644
-cpp-gnu-like option."
opt;
opt
+diff --git a/src/kernel_services/ast_queries/logic_const.mli b/src/kernel_services/ast_queries/logic_const.mli
+index 72d8f3e..64604fd 100644
+--- a/src/kernel_services/ast_queries/logic_const.mli
++++ b/src/kernel_services/ast_queries/logic_const.mli
+@@ -22,7 +22,7 @@
+ (* *)
+ (**************************************************************************)
+
+-(** Smart contructors for logic annotations.
++(** Smart constructors for logic annotations.
+ @plugin development guide *)
+
+ open Cil_types
+diff --git a/src/kernel_services/ast_queries/logic_env.ml b/src/kernel_services/ast_queries/logic_env.ml
+index 6475cf4..8750429 100644
+--- a/src/kernel_services/ast_queries/logic_env.ml
++++ b/src/kernel_services/ast_queries/logic_env.ml
+@@ -92,7 +92,7 @@ module Logic_ctor_builtin =
+ (Datatype.String.Hashtbl)
+ (Cil_datatype.Logic_ctor_info)
+ (struct
+- let name = "built-in logic contructors table"
++ let name = "built-in logic constructors table"
+ let dependencies = []
+ let size = 17
+ end)
+@@ -102,7 +102,7 @@ module Logic_ctor_info =
+ (Datatype.String.Hashtbl)
+ (Cil_datatype.Logic_ctor_info)
+ (struct
+- let name = "logic contructors table"
++ let name = "logic constructors table"
+ let dependencies = [ Logic_ctor_builtin.self ]
+ let size = 17
+ end)
diff --git a/src/kernel_services/ast_queries/logic_typing.ml b/src/kernel_services/ast_queries/logic_typing.ml
index 9694a9f..e20b73c 100644
--- a/src/kernel_services/ast_queries/logic_typing.ml
@@ -146,6 +213,19 @@ index 9694a9f..e20b73c 100644
*)
method! vlogic_info_decl info =
+diff --git a/src/kernel_services/plugin_entry_points/kernel.ml b/src/kernel_services/plugin_entry_points/kernel.ml
+index 0112fac..83d7dd6 100644
+--- a/src/kernel_services/plugin_entry_points/kernel.ml
++++ b/src/kernel_services/plugin_entry_points/kernel.ml
+@@ -1068,7 +1068,7 @@ module UnspecifiedAccess =
+ False(struct
+ let module_name = "UnspecifiedAccess"
+ let option_name = "-unspecified-access"
+- let help = "do not assume that read/write accesses occuring \
++ let help = "do not assume that read/write accesses occurring \
+ between sequence points are separated"
+ end)
+
diff --git a/src/libraries/utils/bitvector.ml b/src/libraries/utils/bitvector.ml
index b2d786b..3ebf43d 100644
--- a/src/libraries/utils/bitvector.ml
@@ -185,6 +265,80 @@ index 9318acb..51ca7df 100644
in
if v.vformal then "parameter of " ^ kf_name
else "local of " ^ kf_name);
+diff --git a/src/plugins/scope/dpds_gui.ml b/src/plugins/scope/dpds_gui.ml
+index b0052bb..019566d 100644
+--- a/src/plugins/scope/dpds_gui.ml
++++ b/src/plugins/scope/dpds_gui.ml
+@@ -379,7 +379,7 @@ let help (main_ui:Design.main_window_extension_points) =
+ ^"and the data is the one that is selected if any, "
+ ^"or it can be given via a popup.\n"
+ ^"\tIf the text given in the popup is empty, or 'Cancel' is chosen, "
+- ^"the selection of the command is reseted.");
++ ^"the selection of the command is reset.");
+ add (ShowDef.help);
+ add (Zones.help);
+ add (DataScope.help);
+diff --git a/src/plugins/security_slicing/security_slicing_parameters.ml b/src/plugins/security_slicing/security_slicing_parameters.ml
+index 6a7e58c..7b40173 100644
+--- a/src/plugins/security_slicing/security_slicing_parameters.ml
++++ b/src/plugins/security_slicing/security_slicing_parameters.ml
+@@ -31,7 +31,7 @@ module Slicing =
+ False
+ (struct
+ let option_name = "-security-slicing"
+- let help = "perfom the security slicing analysis"
++ let help = "perform the security slicing analysis"
+ end)
+
+ (*
+diff --git a/src/plugins/slicing/fct_slice.ml b/src/plugins/slicing/fct_slice.ml
+index 7416760..8631141 100644
+--- a/src/plugins/slicing/fct_slice.ml
++++ b/src/plugins/slicing/fct_slice.ml
+@@ -1035,7 +1035,7 @@ let choose_precise_slice fi_to_call call_info =
+ if more_outputs
+ then (* not enough outputs in [ff] *)
+ begin
+- SlicingParameters.debug ~level:2 "[Fct_Slice.choose_precise_slice] %s ? not enought outputs"
++ SlicingParameters.debug ~level:2 "[Fct_Slice.choose_precise_slice] %s ? not enough outputs"
+ (SlicingMacros.ff_name ff);
+ find slices
+ end
+@@ -1258,7 +1258,7 @@ let apply_missing_outputs proj ff call output_marks more_outputs =
+ (** check if [f_to_call] is ok for this call, and if so,
+ * change the function call and propagate missing marks in the inputs
+ * if needed.
+-* @raise ChangeCallErr if [f_to_call] doesn't compute enought outputs.
++* @raise ChangeCallErr if [f_to_call] doesn't compute enough outputs.
+ *)
+ let apply_change_call proj ff call f_to_call =
+ SlicingParameters.debug ~level:1 "[Fct_Slice.apply_change_call]";
+diff --git a/src/plugins/value/gui_files/register_gui.ml b/src/plugins/value/gui_files/register_gui.ml
+index 7d1e2c9..f45ff94 100644
+--- a/src/plugins/value/gui_files/register_gui.ml
++++ b/src/plugins/value/gui_files/register_gui.ml
+@@ -794,7 +794,7 @@ module Callstacks_manager = struct
+ statement" ()
+ in
+ let chk_consolidated = new Widget.checkbox ~label:"Consolidated value"
+- ~tooltip:"Show values consolidated accross all callstacks" ()
++ ~tooltip:"Show values consolidated across all callstacks" ()
+ in
+ let chk_callstacks = new Widget.checkbox ~label:"Per callstack"
+ ~tooltip:"Show values per callstack" ()
+diff --git a/src/plugins/value/value_parameters.ml b/src/plugins/value/value_parameters.ml
+index 3dc6b8f..beb79cd 100644
+--- a/src/plugins/value/value_parameters.ml
++++ b/src/plugins/value/value_parameters.ml
+@@ -441,7 +441,7 @@ module WarnCopyIndeterminate =
+ let option_name = "-val-warn-copy-indeterminate"
+ let arg_name = "f | @all"
+ let help = "warn when a statement of the specified functions copies a \
+-value that may be indeterminate (uninitalized or containing escaping address). \
++value that may be indeterminate (uninitialized or containing escaping address). \
+ Set by default; can be deactivated for function 'f' by '=-f', or for all \
+ functions by '=- at all'."
+ end)
diff --git a/src/plugins/value_types/cvalue.ml b/src/plugins/value_types/cvalue.ml
index 947a05b..b743720 100644
--- a/src/plugins/value_types/cvalue.ml
@@ -224,4 +378,30 @@ index dc316d0..54c3437 100644
val share : marks -> term -> unit
(** Returns a list of terms to be shared among all {i shared} or {i
+diff --git a/src/plugins/wp/wpAnnot.ml b/src/plugins/wp/wpAnnot.ml
+index d1d0952..cea0dd8 100644
+--- a/src/plugins/wp/wpAnnot.ml
++++ b/src/plugins/wp/wpAnnot.ml
+@@ -1274,7 +1274,7 @@ let build_configs assigns kf model behaviors ki property =
+ | None -> ()
+ | Some Kglobal ->
+ debug
+- "[get_strategies] select in function properies at ."
++ "[get_strategies] select in function properties at ."
+ | Some (Kstmt s) ->
+ debug
+ "[get_strategies] select stmt %d properties at ." s.sid
+diff --git a/src/plugins/wp/wp_parameters.ml b/src/plugins/wp/wp_parameters.ml
+index 9ad708a..861dbda 100644
+--- a/src/plugins/wp/wp_parameters.ml
++++ b/src/plugins/wp/wp_parameters.ml
+@@ -372,7 +372,7 @@ let () = Parameter_customize.set_group wp_simplifier
+ module BoundForallUnfolding =
+ Int(struct
+ let option_name = "-wp-bound-forall-unfolding"
+- let help = "Instanciate up to <n> forall-integers hypotheses."
++ let help = "Instantiate up to <n> forall-integers hypotheses."
+ let arg_name="n"
+ let default = 1000
+ end)
--
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git
More information about the Pkg-ocaml-maint-commits
mailing list