replace deprecated Fmt.kstrf with Fmt.kstr

Signed-off-by: David Scott <[email protected]>

Author: djs55

src/bin/bind.ml

@@ -10,7 +10,7 @@ open Vmnet
 
 let is_windows = Sys.os_type = "Win32"
 
-let failf fmt = Fmt.kstrf (fun e -> Lwt_result.fail (`Msg e)) fmt
+let failf fmt = Fmt.kstr (fun e -> Lwt_result.fail (`Msg e)) fmt
 
 module Make(Socket: Sig.SOCKETS) = struct
 

src/bin/connect.ml

@@ -38,7 +38,7 @@ module Unix = struct
       | Error e ->
         Log.err (fun f -> f "vsock connect write got %a" pp_write_error e);
         close flow >>= fun () ->
-        Fmt.kstrf Lwt.fail_with "%a" pp_write_error e
+        Fmt.kstr Lwt.fail_with "%a" pp_write_error e
 end
 
 module Hvsock = struct

src/dns_forward/dns_forward_error.ml

@@ -18,7 +18,7 @@ open Lwt.Infix
 
 type 'a t = ('a, [ `Msg of string ]) Lwt_result.t
 
-let errorf fmt = Fmt.kstrf (fun s -> Lwt.return (Error (`Msg s))) fmt
+let errorf fmt = Fmt.kstr (fun s -> Lwt.return (Error (`Msg s))) fmt
 
 module FromFlowError(Flow: Mirage_flow.S) = struct
   let (>>=) m f = m >>= function

src/dns_mirage/dns_resolver_mirage.ml

@@ -110,7 +110,7 @@ module Make(Time:Mirage_time.S)(S:Mirage_stack.V4) = struct
       let txfn buf =
         S.UDPV4.write ~src_port ~dst ~dst_port udp buf >>= function
         | Error e ->
-          Fmt.kstrf fail_with
+          Fmt.kstr fail_with
             "Attempting to communicate with remote resolver: %a"
             S.UDPV4.pp_error e
         | Ok () -> Lwt.return_unit

src/fs9p/fs9p.ml

@@ -17,7 +17,7 @@ let ok x = Lwt.return (Ok x)
 
 let map_error x = Fs9p_error.map_error x
 
-let error fmt = Fmt.kstrf (fun s -> Lwt.return (Fs9p_error.error "%s" s)) fmt
+let error fmt = Fmt.kstr (fun s -> Lwt.return (Fs9p_error.error "%s" s)) fmt
 
 let err_not_a_dir name = error "%S is not a directory" name
 

src/hostnet/capture.ml

@@ -19,7 +19,7 @@ module Make(Input: Sig.VMNET) = struct
   let lift_error = function
   | Ok x    -> Ok x
   | Error (#Mirage_net.Net.error as e) -> Error e
-  | Error e -> Fmt.kstrf (fun s -> Error (`Unknown s)) "%a" Input.pp_error e
+  | Error e -> Fmt.kstr (fun s -> Error (`Unknown s)) "%a" Input.pp_error e
 
   type packet = {
     id: int; (* unique id *)

src/hostnet/cohttp_mirage_io.ml

@@ -27,7 +27,7 @@ module Make (Channel: Mirage_channel.S) = struct
   type oc = Channel.t
   type conn = Channel.flow
 
-  let failf fmt = Fmt.kstrf Lwt.fail_with fmt
+  let failf fmt = Fmt.kstr Lwt.fail_with fmt
 
   let read_line ic =
     Channel.read_line ic >>= function

src/hostnet/filter.ml

@@ -19,7 +19,7 @@ module Make(Input: Sig.VMNET) = struct
   let lift_error = function
   | Ok x    -> Ok x
   | Error (#Mirage_net.Net.error as e) -> Error e
-  | Error e -> Fmt.kstrf (fun s -> Error (`Unknown s)) "%a" Input.pp_error e
+  | Error e -> Fmt.kstr (fun s -> Error (`Unknown s)) "%a" Input.pp_error e
 
   type t = {
     input: Input.t;

src/hostnet/forward.ml

@@ -25,19 +25,19 @@ let set_allowed_addresses ips =
     ));
   allowed_addresses := ips
 
-let errorf fmt = Fmt.kstrf (fun e -> Error (`Msg e)) fmt
-let errorf' fmt = Fmt.kstrf (fun e -> Lwt.return (Error (`Msg e))) fmt
+let errorf fmt = Fmt.kstr (fun e -> Error (`Msg e)) fmt
+let errorf' fmt = Fmt.kstr (fun e -> Lwt.return (Error (`Msg e))) fmt
 
 module Port = struct
   type t = Forwarder.Frame.Destination.t
 
   let to_string = function
     | `Tcp (ip, port) ->
-      Fmt.strf "tcp:%a:%d" Ipaddr.pp ip port
+      Fmt.str "tcp:%a:%d" Ipaddr.pp ip port
     | `Udp (ip, port) ->
-      Fmt.strf "udp:%a:%d" Ipaddr.pp ip port
+      Fmt.str "udp:%a:%d" Ipaddr.pp ip port
     | `Unix path ->
-      Fmt.strf "unix:%s" (Base64.encode_exn path)
+      Fmt.str "unix:%s" (Base64.encode_exn path)
 
   let of_string x =
     try
@@ -80,7 +80,7 @@ struct
   let get_key t = t.local
 
   let to_string t =
-    Fmt.strf "%s:%s" (Port.to_string t.local) (Port.to_string t.remote_port)
+    Fmt.str "%s:%s" (Port.to_string t.local) (Port.to_string t.remote_port)
 
   let description_of_format =
     "tcp:<local IP>:<local port>:tcp:<remote IP>:<remote port>
@@ -190,13 +190,13 @@ unix:<base64-encoded local path>:unix:<base64-encoded remote path>"
   let conn_read flow buf =
     Mux.Channel.read_into flow buf >>= function
     | Ok `Eof       -> Lwt.fail End_of_file
-    | Error e       -> Fmt.kstrf Lwt.fail_with "%a" Mux.Channel.pp_error e
+    | Error e       -> Fmt.kstr Lwt.fail_with "%a" Mux.Channel.pp_error e
     | Ok (`Data ()) -> Lwt.return ()
 
   let conn_write flow buf =
     Mux.Channel.write flow buf >>= function
     | Error `Closed -> Lwt.fail End_of_file
-    | Error e       -> Fmt.kstrf Lwt.fail_with "%a" Mux.Channel.pp_write_error e
+    | Error e       -> Fmt.kstr Lwt.fail_with "%a" Mux.Channel.pp_write_error e
     | Ok ()         -> Lwt.return ()
 
   let start_udp_proxy description remote_port server =
@@ -293,7 +293,7 @@ unix:<base64-encoded local path>:unix:<base64-encoded remote path>"
     match t.local with
     | `Tcp (local_ip, local_port) ->
       let description =
-        Fmt.strf "forwarding from tcp:%a:%d" Ipaddr.pp local_ip local_port
+        Fmt.str "forwarding from tcp:%a:%d" Ipaddr.pp local_ip local_port
       in
       Lwt.catch (fun () ->
           check_bind_allowed local_ip  >>= fun () ->
@@ -326,7 +326,7 @@ unix:<base64-encoded local path>:unix:<base64-encoded remote path>"
         )
     | `Udp (local_ip, local_port) ->
       let description =
-        Fmt.strf "forwarding from udp:%a:%d" Ipaddr.pp local_ip local_port
+        Fmt.str "forwarding from udp:%a:%d" Ipaddr.pp local_ip local_port
       in
       Lwt.catch (fun () ->
           check_bind_allowed local_ip >>= fun () ->
@@ -359,7 +359,7 @@ unix:<base64-encoded local path>:unix:<base64-encoded remote path>"
         )
     | `Unix path ->
       let description =
-        Fmt.strf "forwarding from unix:%s" path
+        Fmt.str "forwarding from unix:%s" path
       in
       Lwt.catch (fun () ->
           Socket.Stream.Unix.bind ~description path

src/hostnet/frame.ml

@@ -31,7 +31,7 @@ let ( >>= ) m f = match m with
 | Ok x -> f x
 | Error x -> Error x
 
-let errorf fmt = Fmt.kstrf (fun e -> Error (`Msg e)) fmt
+let errorf fmt = Fmt.kstr (fun e -> Error (`Msg e)) fmt
 
 let need_space_for bufs n description =
   if Cstructs.len bufs < n