[Xen-changelog] [xen master] tools/ocaml: make type of Xsraw.sync more precise

[p***@xen.org]

commit 87e89bd112e16503f37d219a525a5b5d470e08f9
Author: Christian Lindig <***@citrix.com>
AuthorDate: Tue Oct 30 10:19:06 2018 +0000
Commit: Ian Jackson <***@eu.citrix.com>
CommitDate: Thu Nov 1 11:24:03 2018 +0000

tools/ocaml: make type of Xsraw.sync more precise

The type of Xsraw.sync is made more precise:

from val sync : (Xenbus.Xb.t -> 'a) -> con -> string
to val sync : (Xenbus.Xb.t -> unit) -> con -> string

The first argument is enforced to return unit rather than a value that
is not used anyway.

[ No functional change. -iwj ]

Signed-off-by: Christian Lindig <***@citrix.com>
Acked-by: Ian Jackson <***@eu.citrix.com>
---
tools/ocaml/libs/xs/xsraw.mli | 2 +-
tools/ocaml/xenstored/process.ml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ocaml/libs/xs/xsraw.mli b/tools/ocaml/libs/xs/xsraw.mli
index 57e4fb0c90..374f0f9fad 100644
--- a/tools/ocaml/libs/xs/xsraw.mli
+++ b/tools/ocaml/libs/xs/xsraw.mli
@@ -33,7 +33,7 @@ val has_watchevents : con -> bool
val get_watchevent : con -> string * string
val read_watchevent : con -> string * string
val sync_recv : Xenbus.Xb.Op.operation -> con -> string
-val sync : (Xenbus.Xb.t -> 'a) -> con -> string
+val sync : (Xenbus.Xb.t -> unit) -> con -> string
val ack : string -> unit
val validate_path : string -> unit
val validate_watch_path : string -> unit
diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml
index 977e7c11be..d813d7fd50 100644
--- a/tools/ocaml/xenstored/process.ml
+++ b/tools/ocaml/xenstored/process.ml
@@ -348,7 +348,7 @@ let transaction_replay c t doms cons =
false
)
(fun () ->
- Connection.end_transaction c tid None
+ ignore @@ Connection.end_transaction c tid None
)

let do_watch con t domains cons data =
@@ -366,7 +366,7 @@ let do_unwatch con t domains cons data =
| [node; token; ""] -> node, token
| _ -> raise Invalid_Cmd_Args
in
- Connections.del_watch cons con node token
+ ignore @@ Connections.del_watch cons con node token

let do_transaction_start con t domains cons data =
if Transaction.get_id t <> Transaction.none then
--
generated by git-patchbot for /home/xen/git/xen.git#master