style

app/vmm_console.ml

@@ -123,35 +123,27 @@ let handle s addr () =
       (if not (version_eq hdr.version my_version) then
          Lwt.return (Error (`Msg "ignoring data with bad version"))
        else
-         match Console.int_to_op hdr.tag with
+         match decode_str data with
-         | Some Add ->
+         | Error e -> Lwt.return (Error e)
-           (match decode_str data with
+         | Ok (name, off) ->
-            | Error e -> Lwt.return (Error e)
+           match Console.int_to_op hdr.tag with
-            | Ok (name, _) -> add_fifo s name)
+           | Some Add -> add_fifo s name
-         | Some Attach ->
+           | Some Attach -> attach name
-           (match decode_str data with
+           | Some Detach -> detach name
-            | Error e -> Lwt.return (Error e)
+           | Some History ->
-            | Ok (name, _) -> attach name)
+             (match decode_ts ~off data with
-         | Some Detach ->
+              | Error e -> Lwt.return (Error e)
-           (match decode_str data with
+              | Ok since -> history s name since)
-            | Error e -> Lwt.return (Error e)
+           | _ ->
-            | Ok (name, _) -> detach name)
+             Lwt.return (Error (`Msg "unknown command"))) >>= (function
-         | Some History ->
-           (match decode_str data with
-             | Error e -> Lwt.return (Error e)
-             | Ok (name, off) -> match decode_ts ~off data with
-               | Error e -> Lwt.return (Error e)
-               | Ok since -> history s name since)
-          | _ ->
-            Lwt.return (Error (`Msg "unknown command"))) >>= (function
           | Ok msg -> Vmm_lwt.write_raw s (success ~msg hdr.id my_version)
           | Error (`Msg msg) ->
             Logs.err (fun m -> m "error while processing command: %s" msg) ;
             Vmm_lwt.write_raw s (fail ~msg hdr.id my_version)) >>= function
-            | Ok () -> loop ()
+      | Ok () -> loop ()
-            | Error _ ->
+      | Error _ ->
-              Logs.err (fun m -> m "exception while writing to socket") ;
+        Logs.err (fun m -> m "exception while writing to socket") ;
-              Lwt.return_unit
+        Lwt.return_unit
   in
   loop () >>= fun () ->
   Lwt.catch (fun () -> Lwt_unix.close s) (fun _ -> Lwt.return_unit)

app/vmm_log.ml

@@ -85,8 +85,7 @@ let handle fd ring s addr () =
                    in
                    Ok (`Out out)
              end
-           | _ ->
+           | _ -> Error (`Msg "unknown command"))
-             Error (`Msg "unknown command"))
       in
       match out with
       | Error (`Msg msg) ->

provision/vmm_req_delegation.ml

@@ -13,7 +13,7 @@ let subca_csr key name cpus mem vms block bridges =
     | Some x -> [ (false, `Unsupported (Oid.block, int_to_cstruct x)) ]
   and bridge = match bridges with
     | [] -> []
-    | xs -> [ (false, `Unsupported (Oid.bridges, bridges_to_cstruct bridges)) ]
+    | xs -> [ (false, `Unsupported (Oid.bridges, bridges_to_cstruct xs)) ]
   in
   let exts =
     [ (false, `Unsupported (Oid.version, version_to_cstruct asn_version)) ;

src/vmm_engine.ml

@@ -345,7 +345,7 @@ let handle_revocation t s leaf chain ca prefix =
    | None -> Ok ()
    | Some local -> match X509.CRL.crl_number local, X509.CRL.crl_number crl with
      | None, _ -> Ok ()
-     | Some x, None -> Error (`Msg "CRL number not present")
+     | Some _, None -> Error (`Msg "CRL number not present")
      | Some x, Some y -> if y > x then Ok () else Error (`Msg "CRL number not increased")) >>= fun () ->
   (* filename should be whatever_dir / crls / <id> *)
   let filename = Fpath.(t.dir / "crls" / string_of_id prefix) in
@@ -355,7 +355,7 @@ let handle_revocation t s leaf chain ca prefix =
   let crls =
     match local with
     | None -> crl :: t.crls
-    | Some x -> crl :: List.filter (fun c -> c <> crl) t.crls
+    | Some _ -> crl :: List.filter (fun c -> c <> crl) t.crls
   in
   (* iterate over revoked serials, find active resources, and kill them *)
   let newly_revoked =
@@ -508,7 +508,7 @@ let handle_log state hdr buf =
     state, []
   end else match IM.find hdr.id state.log_requests with
     | exception Not_found ->
-      Logs.err (fun m -> m "coudn't find log request") ;
+      Logs.warn (fun m -> m "(ignored) coudn't find log request") ;
       (state, [])
     | (s, rid) ->
       let r = match int_to_op hdr.tag with