# HG changeset patch # User David Scott <[email protected]> # Date 1261410031 0 # Node ID 5804d83078d753643135d39a82da533a91909132 # Parent 5d7ca743daabc6eebb95684a757201b24bb41656 CA-33440: Remove an unused open() of /dev/null, allowing us to delete the helper function which did it.
Signed-off-by: David Scott <[email protected]> diff -r 5d7ca743daab -r 5804d83078d7 ocaml/gpg/gpg.ml --- a/ocaml/gpg/gpg.ml Mon Dec 21 15:40:31 2009 +0000 +++ b/ocaml/gpg/gpg.ml Mon Dec 21 15:40:31 2009 +0000 @@ -93,8 +93,6 @@ finally (* make sure I close all my open fds in the end *) (fun () -> - Forkhelpers.with_dev_null (* open /dev/null *) - (fun dev_null -> (* Capture stderr output for logging *) match Forkhelpers.with_logfile_fd "gpg" (fun log_fd -> @@ -114,7 +112,7 @@ raise InvalidSignature | Forkhelpers.Failure(log, exn) -> debug "Error from gpg: %s" log; - raise exn)) + raise exn) (fun () -> List.iter Unix.close !fds_to_close) let with_signed_cleartext filename f = 1 file changed, 1 insertion(+), 3 deletions(-) ocaml/gpg/gpg.ml | 4 +---
# HG changeset patch # User David Scott <[email protected]> # Date 1261410031 0 # Node ID 5804d83078d753643135d39a82da533a91909132 # Parent 5d7ca743daabc6eebb95684a757201b24bb41656 CA-33440: Remove an unused open() of /dev/null, allowing us to delete the helper function which did it. Signed-off-by: David Scott <[email protected]> diff -r 5d7ca743daab -r 5804d83078d7 ocaml/gpg/gpg.ml --- a/ocaml/gpg/gpg.ml Mon Dec 21 15:40:31 2009 +0000 +++ b/ocaml/gpg/gpg.ml Mon Dec 21 15:40:31 2009 +0000 @@ -93,8 +93,6 @@ finally (* make sure I close all my open fds in the end *) (fun () -> - Forkhelpers.with_dev_null (* open /dev/null *) - (fun dev_null -> (* Capture stderr output for logging *) match Forkhelpers.with_logfile_fd "gpg" (fun log_fd -> @@ -114,7 +112,7 @@ raise InvalidSignature | Forkhelpers.Failure(log, exn) -> debug "Error from gpg: %s" log; - raise exn)) + raise exn) (fun () -> List.iter Unix.close !fds_to_close) let with_signed_cleartext filename f =
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
