From: David Scott Date: Mon, 21 Dec 2009 15:36:51 +0000 (+0000) Subject: CA-33440: remove some unused arguments from execute_command_get_output X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e449f5c41f8bd9b7511e2a3dce18a125c2363e86;p=xcp%2Fxen-api-libs.git CA-33440: remove some unused arguments from execute_command_get_output Signed-off-by: David Scott --- diff --git a/stdext/forkhelpers.ml b/stdext/forkhelpers.ml index e5e8d32..5b259c2 100644 --- a/stdext/forkhelpers.ml +++ b/stdext/forkhelpers.ml @@ -152,7 +152,7 @@ let safe_close_and_exec ?env stdin stdout stderr (fds: (string * Unix.file_descr close_fds -let execute_command_get_output ?(cb_set=(fun _ -> ())) ?(cb_clear=(fun () -> ())) cmd args = +let execute_command_get_output cmd args = match with_logfile_fd "execute_command_get_out" (fun out_fd -> with_logfile_fd "execute_command_get_err" (fun err_fd -> let (sock,pid) = safe_close_and_exec None (Some out_fd) (Some err_fd) [] cmd args in diff --git a/stdext/forkhelpers.mli b/stdext/forkhelpers.mli index 2d9d2f1..590db8c 100644 --- a/stdext/forkhelpers.mli +++ b/stdext/forkhelpers.mli @@ -17,7 +17,7 @@ (** [execute_command_get_output cmd args] runs [cmd args] and returns (stdout, stderr) on success (exit 0). On failure this raises [Spawn_internal_error(stderr, stdout, Unix.process_status)] *) -val execute_command_get_output : ?cb_set:(int -> unit) -> ?cb_clear:(unit -> unit) -> string -> string list -> string * string +val execute_command_get_output : string -> string list -> string * string (** Thrown by [execute_command_get_output] if the subprocess exits with a non-zero exit code *) exception Spawn_internal_error of string * string * Unix.process_status