Deleted parse_commandline and renamed parse_commandline_2 to parse_commandline.

parse_commandline was only used for compat-mode, which we just removed.

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>

diff --git a/ocaml/xapi/cli_frontend.ml b/ocaml/xapi/cli_frontend.ml
index 84fe5937e8b0c74ef69841fd3ff99e43ce916bdf..2624732ac0b258848eb2ae4412d5976a76ebdd64 100644 (file)
--- a/ocaml/xapi/cli_frontend.ml
+++ b/ocaml/xapi/cli_frontend.ml
@@ -2423,9 +2423,6 @@ let parse tokens =
         params = (parse_params ts) }
     | _ -> raise (ParseError ("No arguments given"))
 
-let parse_commandline arg_array =
-  parse (tokens_of_argv arg_array)
-
 let rec parse_params_2 xs =
   match xs with
       p::ps ->
@@ -2448,7 +2445,7 @@ let rec parse_params_2 xs =
          end
     | [] -> []
 
-let parse_commandline_2 arg_list =
+let parse_commandline arg_list =
   try
     let argv0 = List.hd arg_list in
     let cmdname = List.hd (List.tl arg_list) in

diff --git a/ocaml/xapi/xapi_cli.ml b/ocaml/xapi/xapi_cli.ml
index 5d1604008b1bf4dffac79353adf7844d10832d85..a5ff5cd37f94ccbfe2ee16420252d6875b1eec81 100644 (file)
--- a/ocaml/xapi/xapi_cli.ml
+++ b/ocaml/xapi/xapi_cli.ml
@@ -204,7 +204,7 @@ let do_handle (req:Http.request) str (s:Unix.file_descr) =
                        then (Some (Ref.of_string (String.sub line 11 (String.length line - 11))), List.tl args)
                        else (None,args)
                with _ -> (None,args) in
-       let cmd = parse_commandline_2 ("xe"::args) in
+       let cmd = parse_commandline ("xe"::args) in
        ignore(exec_command req cmd s session args)
 
 let exception_handler s e =

diff --git a/ocaml/xe-cli/cli.ml b/ocaml/xe-cli/cli.ml
index bd1bbcd9292dc6d0aaf4871cd231900f2122c7ef..e1e4b993c9baf9d23fee76642e76ca02331fea02 100644 (file)
--- a/ocaml/xe-cli/cli.ml
+++ b/ocaml/xe-cli/cli.ml
@@ -119,9 +119,11 @@ let param_error t s =
   exit exit_error)
 
 let main() =
-(*  try*)
-    let cmd = Cli_frontend.parse_commandline (Array.to_list Sys.argv) in
-    exec_command cmd
+       (* try*)
+       let parse_commandline arg_array =
+               parse (tokens_of_argv arg_array) in
+       let cmd = parse_commandline (Array.to_list Sys.argv) in
+       exec_command cmd
 (*  with
       Cli_frontend.ParseError s ->
        param_error "Syntax error" s;