simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-08 12:15:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

small cleanup

Browse source
This commit is contained in:
Simon Cruanes 2016-03-26 12:21:20 +01:00
parent 0d2fc07e52
commit 03350031a3
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core/CCIO.ml
View file

@ -49,15 +49,18 @@ let gen_flat_map f next_elem =
in in
next 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 with_in ?(mode=0o644) ?(flags=[Open_text]) filename f =
let ic = open_in_gen (Open_rdonly::flags) mode filename in let ic = open_in_gen (Open_rdonly::flags) mode filename in
try finally_ f ic ~h:close_in
let x = f ic in
close_in ic;
x
with e ->
close_in ic;
raise e
let read_chunks ?(size=1024) ic = let read_chunks ?(size=1024) ic =
let buf = Bytes.create size in 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 with_out ?(mode=0o644) ?(flags=[Open_creat; Open_trunc; Open_text]) filename f =
let oc = open_out_gen (Open_wronly::flags) mode filename in let oc = open_out_gen (Open_wronly::flags) mode filename in
try finally_ f oc ~h:close_out
let x = f oc in
close_out oc;
x
with e ->
close_out oc;
raise e
let with_out_a ?mode ?(flags=[]) filename f = let with_out_a ?mode ?(flags=[]) filename f =
with_out ?mode ~flags:(Open_wronly::Open_creat::Open_append::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 gen_filter_map
(function (function
| `File, f -> Some f | `File, f -> Some f
| `Dir, _ -> None | `Dir, _ -> None)
) (walk d) (walk d)
else read_dir_base d else read_dir_base d
let show_walk_item (i,f) = let show_walk_item (i,f) =