X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgenerator.ml;h=b7878506685d3bdc9f97d334aba857b6c1a98cab;hb=ad7497c533cc5c24f667104bebbfa5f6dda8c8f6;hp=6aaaf67b32359379bdf1b6b2efca9fa932fa09a0;hpb=bf920f57677c67f903cf8c4c985ce3d290b1dbde;p=libguestfs.git

diff --git a/src/generator.ml b/src/generator.ml
index 6aaaf67..b787850 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -169,15 +169,7 @@ type flags =
   | FishAction of string  (* call this function in guestfish *)
   | NotInFish		  (* do not export via guestfish *)
   | NotInDocs		  (* do not add this function to documentation *)
-
-let protocol_limit_warning =
-  "Because of the message protocol, there is a transfer limit
-of somewhere between 2MB and 4MB.  To transfer large files you should use
-FTP."
-
-let danger_will_robinson =
-  "B<This command is dangerous.  Without careful use you
-can easily destroy all your data>."
+  | DeprecatedBy of string (* function is deprecated, use .. instead *)
 
 (* You can supply zero or as many tests as you want per API call.
  *
@@ -1457,7 +1449,10 @@ This call uses the standard L<file(1)> command to determine
 the type or contents of the file.  This also works on devices,
 for example to find out whether a partition contains a filesystem.
 
-The exact command which runs is C<file -bsL path>.  Note in
+This call will also transparently look inside various types
+of compressed file.
+
+The exact command which runs is C<file -zbsL path>.  Note in
 particular that the filename is not prepended to the output
 (the C<-b> option).");
 
@@ -2922,7 +2917,7 @@ were rarely if ever used anyway.
 
 See also C<guestfs_sfdisk> and the L<sfdisk(8)> manpage.");
 
-  ("zfile", (RString "description", [String "method"; String "path"]), 140, [],
+  ("zfile", (RString "description", [String "method"; String "path"]), 140, [DeprecatedBy "file"],
    [],
    "determine file type inside a compressed file",
    "\
@@ -2931,7 +2926,8 @@ using C<method>.
 
 C<method> must be one of C<gzip>, C<compress> or C<bzip2>.
 
-See also: C<guestfs_file>");
+Since 1.0.63, use C<guestfs_file> instead which can now
+process compressed files.");
 
   ("getxattrs", (RStructList ("xattrs", "xattr"), [String "path"]), 141, [],
    [],
@@ -3380,6 +3376,31 @@ let seq_of_test = function
   | TestOutputLength (s, _) | TestOutputStruct (s, _)
   | TestLastFail s -> s
 
+(* Handling for function flags. *)
+let protocol_limit_warning =
+  "Because of the message protocol, there is a transfer limit
+of somewhere between 2MB and 4MB.  To transfer large files you should use
+FTP."
+
+let danger_will_robinson =
+  "B<This command is dangerous.  Without careful use you
+can easily destroy all your data>."
+
+let deprecation_notice flags =
+  try
+    let alt =
+      find_map (function DeprecatedBy str -> Some str | _ -> None) flags in
+    let txt =
+      sprintf "This function is deprecated.
+In new code, use the C<%s> call instead.
+
+Deprecated functions will not be removed from the API, but the
+fact that they are deprecated indicates that there are problems
+with correct use of these functions." alt in
+    Some txt
+  with
+    Not_found -> None
+
 (* Check function names etc. for consistency. *)
 let check_functions () =
   let contains_uppercase str =
@@ -3628,7 +3649,10 @@ I<The caller must free the returned buffer after use>.\n\n"
 	if List.mem ProtocolLimitWarning flags then
 	  pr "%s\n\n" protocol_limit_warning;
 	if List.mem DangerWillRobinson flags then
-	  pr "%s\n\n" danger_will_robinson
+	  pr "%s\n\n" danger_will_robinson;
+	match deprecation_notice flags with
+	| None -> ()
+	| Some txt -> pr "%s\n\n" txt
       )
   ) all_functions_sorted
 
@@ -5349,6 +5373,12 @@ and generate_fish_cmds () =
 	    ("\n\n" ^ danger_will_robinson)
 	  else "" in
 
+      let warnings =
+	warnings ^
+	  match deprecation_notice flags with
+	  | None -> ""
+	  | Some txt -> "\n\n" ^ txt in
+
       let describe_alias =
 	if name <> alias then
 	  sprintf "\n\nYou can use '%s' as an alias for this command." alias
@@ -5720,7 +5750,11 @@ and generate_fish_actions_pod () =
 	pr "%s\n\n" protocol_limit_warning;
 
       if List.mem DangerWillRobinson flags then
-	pr "%s\n\n" danger_will_robinson
+	pr "%s\n\n" danger_will_robinson;
+
+      match deprecation_notice flags with
+      | None -> ()
+      | Some txt -> pr "%s\n\n" txt
   ) all_functions_sorted
 
 (* Generate a C function prototype. *)
@@ -6637,7 +6671,10 @@ sub new {
 	if List.mem ProtocolLimitWarning flags then
 	  pr "%s\n\n" protocol_limit_warning;
 	if List.mem DangerWillRobinson flags then
-	  pr "%s\n\n" danger_will_robinson
+	  pr "%s\n\n" danger_will_robinson;
+	match deprecation_notice flags with
+	| None -> ()
+	| Some txt -> pr "%s\n\n" txt
       )
   ) all_functions_sorted;
 
@@ -7161,6 +7198,10 @@ class GuestFS:
 	  if List.mem DangerWillRobinson flags then
 	    doc ^ "\n\n" ^ danger_will_robinson
 	  else doc in
+	let doc =
+	  match deprecation_notice flags with
+	  | None -> doc
+	  | Some txt -> doc ^ "\n\n" ^ txt in
 	let doc = pod2text ~width:60 name doc in
 	let doc = List.map (fun line -> replace_str line "\\" "\\\\") doc in
 	let doc = String.concat "\n        " doc in
@@ -7569,6 +7610,10 @@ public class GuestFS {
 	  if List.mem DangerWillRobinson flags then
 	    doc ^ "\n\n" ^ danger_will_robinson
 	  else doc in
+	let doc =
+	  match deprecation_notice flags with
+	  | None -> doc
+	  | Some txt -> doc ^ "\n\n" ^ txt in
 	let doc = pod2text ~width:60 name doc in
 	let doc = List.map (		(* RHBZ#501883 *)
 	  function