Apply suggestions from review

frama_Clang_option.ml

@@ -60,14 +60,14 @@ let pp_unmangling_functions fmt =
 
 let () =
   Datatype.String.Hashtbl.add
-    unmangling_functions "none" ("keep mangled names", fun id -> id)
+    unmangling_functions "none" ("keep mangled names", Fun.id)
 
 module Unmangling =
   String(
   struct
     let option_name = "-cxx-unmangling"
     let help =
-      "how to pretty-print mangled symbols. Use -unmangling help to list \
+      "how to pretty-print mangled symbols. Use `-cxx-unmangling help' to list \
        available options"
     let arg_name = "s"
     let default = "none"
@@ -97,14 +97,14 @@ let get_unmangling_function () =
   else
     fatal
       "cannot get current unmangling function: \
-       Frama-C is not supposed to run analyses if `-unmangling help' is set "
+       Frama-C is not supposed to run analyses if `-cxx-unmangling help' is set "
 
 module UnmanglingFull =
   Bool(struct
              let default = false
              let option_name = "-cxx-demangling-full"
              let help= "displays identifiers with their full C++ name. \
-                        OBSOLETE: use -unmangling fully-qualified instead)"
+                        DEPRECATED: use -cxx-unmangling fully-qualified instead)"
         end)
 
 let () = Parameter_customize.set_negative_option_name ""
@@ -116,7 +116,7 @@ module UnmanglingShort =
              let help=
                "displays identifiers with their C++ short name \
                 (without qualifiers). \
-                OBSOLETE: use -unmangling without-qualifier instead"
+                DEPRECATED: use -cxx-unmangling without-qualifier instead"
         end)
 
 let () = Parameter_customize.set_negative_option_name ""
@@ -126,7 +126,7 @@ module UnmanglingNo =
              let default = false
              let option_name= "-cxx-keep-mangling"
              let help= "displays identifiers with their mangled name \
-                        OBSOLETE: use -unmangling none instead"
+                        DEPRECATED: use -cxx-unmangling none instead"
            end)
 
 let add_unmangling_option s _ new_flag =

frama_Clang_option.mli

@@ -27,12 +27,12 @@ module Clang_command: Parameter_sig.String
 
 module Clang_extra_args: Parameter_sig.String_list
 
-(** state of the -unmangling option. *)
+(** state of the -cxx-unmangling option. *)
 module Unmangling: Parameter_sig.String
 
 (** [add_unmangling_function key descr f] registers [f] as an unmangling
-    function, activated by [-unmangling key]. [descr] will be displayed
-    along with [key] in the [-unmangling help] output.
+    function, activated by [-cxx-unmangling key]. [descr] will be displayed
+    along with [key] in the [-cxx-unmangling help] output.
  *)
 val add_unmangling_function: string -> string -> (string -> string) -> unit