maintenance: use stdext without opening modules

psafont · psafont · commit 6b8db678669b · 2020-03-27T16:41:30.000Z
Signed-off-by: Pau Ruiz Safont &lt;pau.safont@citrix.com&gt;
diff --git a/lib/fecomms.ml b/lib/fecomms.ml
@@ -1,4 +1,4 @@
-open Xapi_stdext_unix
+module Unixext = Xapi_stdext_unix.Unixext
 open Fe
 
 let open_unix_domain_sock () =
diff --git a/lib/forkhelpers.ml b/lib/forkhelpers.ml
@@ -23,7 +23,7 @@
 
 let default_path = [ "/sbin"; "/usr/sbin"; "/bin"; "/usr/bin" ]
 
-open Xapi_stdext_pervasives.Pervasiveext
+let finally = Xapi_stdext_pervasives.Pervasiveext.finally
 
 type pidty = (Unix.file_descr * int) (* The forking executioner has been used, therefore we need to tell *it* to waitpid *)
 
diff --git a/src/child.ml b/src/child.ml
@@ -98,7 +98,7 @@ let log_failure args child_pid reason =
   Fe_debug.error "%d (%s) %s" child_pid cmdline' reason
 
 let report_child_exit comms_sock args child_pid status =
-  let open Xapi_stdext_unix in
+  let module Unixext = Xapi_stdext_unix.Unixext in
   let pr = match status with
     | Unix.WEXITED n ->
       (* Unfortunately logging this was causing too much spam *)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-open Xapi_stdext_unix`
	`1`	`+module Unixext = Xapi_stdext_unix.Unixext`
`2`	`2`	`open Fe`
`3`	`3`
`4`	`4`	`let open_unix_domain_sock () =`