From 03350031a3d4c1cbeeab3d356aff9f463a9457c1 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Sat, 26 Mar 2016 12:21:20 +0100
Subject: [PATCH] small cleanup

---
 src/core/CCIO.ml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/core/CCIO.ml b/src/core/CCIO.ml
index 5de7ed60..b3c1231a 100644
--- a/src/core/CCIO.ml
+++ b/src/core/CCIO.ml
@@ -49,15 +49,18 @@ let gen_flat_map f next_elem =
   in
   next
 
+let finally_ f x ~h =
+  try
+    let res = f x in
+    h x;
+    res
+  with e ->
+    h x;
+    raise e
+
 let with_in ?(mode=0o644) ?(flags=[Open_text]) filename f =
   let ic = open_in_gen (Open_rdonly::flags) mode filename in
-  try
-    let x = f ic in
-    close_in ic;
-    x
-  with e ->
-    close_in ic;
-    raise e
+  finally_ f ic ~h:close_in
 
 let read_chunks ?(size=1024) ic =
   let buf = Bytes.create size in
@@ -139,13 +142,7 @@ let read_all ?(size=1024) ic = read_all_ ~op:Ret_string ~size ic
 
 let with_out ?(mode=0o644) ?(flags=[Open_creat; Open_trunc; Open_text]) filename f =
   let oc = open_out_gen (Open_wronly::flags) mode filename in
-  try
-    let x = f oc in
-    close_out oc;
-    x
-  with e ->
-    close_out oc;
-    raise e
+  finally_ f oc ~h:close_out
 
 let with_out_a ?mode ?(flags=[]) filename f =
   with_out ?mode ~flags:(Open_wronly::Open_creat::Open_append::flags) filename f
@@ -323,8 +320,8 @@ module File = struct
       gen_filter_map
         (function
           | `File, f -> Some f
-          | `Dir, _ -> None
-        ) (walk d)
+          | `Dir, _ -> None)
+        (walk d)
     else read_dir_base d
 
   let show_walk_item (i,f) =