Changes to the Release_config API

andrenth · Sep 6, 2012 · c4645ae · c4645ae
1 parent 0f3a2ec
commit c4645ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/lib/config/release_config.ml b/lib/config/release_config.ml
@@ -170,11 +170,8 @@ let parse file spec =
           return (`Error (join_errors errors)) in
   Lwt_mutex.with_lock config_mutex parse_config
 
-let has_section conf section =
-  Hashtbl.mem conf section
-
-let get conf ?(section = global_section) key () =
-  Option.maybe (fun settings -> hash_find settings key) (hash_find conf section)
-
-let get_exn conf ?(section = global_section) key () =
+let get conf section key =
   Hashtbl.find (Hashtbl.find conf section) key
+
+let get_global conf key =
+  get conf global_section key
diff --git a/lib/config/release_config.mli b/lib/config/release_config.mli
@@ -15,6 +15,5 @@ val parse : Lwt_io.file_name
          -> spec
          -> [`Configuration of t | `Error of string] Lwt.t
 val defaults : spec -> t
-val has_section : t -> string -> bool
-val get : t -> ?section:string -> string -> unit -> value option
-val get_exn : t -> ?section:string -> string -> unit -> value
+val get : t -> string -> string -> value
+val get_global : t -> string -> value
diff --git a/lib_test/config_test.ml b/lib_test/config_test.ml
@@ -58,8 +58,8 @@ let spec =
       ])
   ]
 
-let getg c k = C.get_exn c k ()
-let get c s k = C.get_exn c ~section:s k ()
+let getg = C.get_global
+let get = C.get
 
 let () =
   Lwt_main.run