Fix warnings.

src/function_description.ml

@@ -10,23 +10,29 @@ module Functions (F : Ctypes.FOREIGN) = struct
     include Types.LV2
 
     (* Function pointers are tricky, see https://discuss.ocaml.org/t/ctypes-how-to-cast-a-function-pointer-and-then-call-it/9653/4 *)
-    
+
     let descriptor_uri = field descriptor "URI" string
-
-    let descriptor_instantiate = field descriptor "instantiate" descriptor_instantiate_ptr_type
 
-    let descriptor_connect_port = field descriptor "instantiate" descriptor_connect_port_ptr_type
+    let descriptor_instantiate =
+      field descriptor "instantiate" descriptor_instantiate_ptr_type
+
+    let descriptor_connect_port =
+      field descriptor "instantiate" descriptor_connect_port_ptr_type
 
-    let descriptor_activate = field descriptor "activate" descriptor_activate_ptr_type
+    let descriptor_activate =
+      field descriptor "activate" descriptor_activate_ptr_type
 
     let descriptor_run = field descriptor "run" descriptor_run_ptr_type
 
-    let descriptor_deactivate = field descriptor "deactivate" descriptor_deactivate_ptr_type
+    let descriptor_deactivate =
+      field descriptor "deactivate" descriptor_deactivate_ptr_type
+
+    let descriptor_cleanup =
+      field descriptor "cleanup" descriptor_cleanup_ptr_type
+
+    let descriptor_extension_data =
+      field descriptor "extension_data" descriptor_extension_data_ptr_type
 
-    let descriptor_cleanup = field descriptor "cleanup" descriptor_cleanup_ptr_type
-
-    let descriptor_extension_data = field descriptor "extension_data" descriptor_extension_data_ptr_type
-
     let () =
       ignore descriptor_uri;
       ignore descriptor_instantiate;
@@ -51,14 +57,18 @@ module Functions (F : Ctypes.FOREIGN) = struct
 
   type plugin = unit ptr
 
-  let plugin : plugin typ = ptr void
-  let plugin_opt : plugin option typ = ptr_opt void
+  let plugin : plugin typ = typedef (ptr void) "LilvPlugin *"
+  let const_plugin : plugin typ = typedef plugin "const LilvPlugin *"
+
+  let plugin_opt : plugin option typ =
+    typedef (ptr_opt void) "const LilvPlugin *"
 
   type instance_impl
 
   let instance_impl : instance_impl structure typ = structure "LilvInstanceImpl"
 
-  let instance_impl_descriptor = field instance_impl "lv2_descriptor" (ptr LV2.descriptor)
+  let instance_impl_descriptor =
+    field instance_impl "lv2_descriptor" (ptr LV2.descriptor)
 
   let instance_impl_handle = field instance_impl "lv2_handle" LV2.handle
   let instance_impl_pimpl = field instance_impl "pimpl" (ptr void)
@@ -73,24 +83,27 @@ module Functions (F : Ctypes.FOREIGN) = struct
 
   type plugins = unit ptr
 
-  let plugins : plugins typ = ptr void
+  let plugins : plugins typ = typedef (ptr void) "const LilvPlugins *"
 
   type port = unit ptr
 
-  let port : port typ = ptr void
+  let port : port typ = typedef (ptr void) "const LilvPort *"
 
   type plugin_class = unit ptr
 
-  let plugin_class : plugin_class typ = ptr void
+  let plugin_class : plugin_class typ =
+    typedef (ptr void) "const LilvPluginClass *"
 
   type node = unit ptr
 
-  let node : node typ = ptr void
+  let node : node typ = typedef (ptr void) "LilvNode *"
+  let const_node : node typ = typedef node "const LilvNode *"
   let node_opt : node option typ = ptr_opt void
+  let const_string = typedef string "const char *"
 
   type nodes = unit ptr
 
-  let nodes : nodes typ = ptr void
+  let nodes : nodes typ = typedef (ptr void) "const LilvNode *"
 
   type iterator = unit ptr
 
@@ -103,12 +116,15 @@ module Functions (F : Ctypes.FOREIGN) = struct
     let free = foreign "lilv_node_free" (node @-> returning void)
     let equals = foreign "lilv_node_equals" (node @-> node @-> returning bool)
     let is_uri = foreign "lilv_node_is_uri" (node @-> returning bool)
-    let to_uri = foreign "lilv_node_as_uri" (node @-> returning string)
+    let to_uri = foreign "lilv_node_as_uri" (node @-> returning const_string)
     let uri = foreign "lilv_new_uri" (world @-> string @-> returning node)
     let is_blank = foreign "lilv_node_is_blank" (node @-> returning bool)
-    let to_blank = foreign "lilv_node_as_blank" (node @-> returning string)
+    let to_blank = foreign "lilv_node_as_blank" (node @-> returning const_string)
     let is_string = foreign "lilv_node_is_string" (node @-> returning bool)
-    let to_string = foreign "lilv_node_as_string" (node @-> returning string)
+
+    let to_string =
+      foreign "lilv_node_as_string" (node @-> returning const_string)
+
     let string = foreign "lilv_new_string" (world @-> string @-> returning node)
     let is_int = foreign "lilv_node_is_int" (node @-> returning bool)
     let to_int = foreign "lilv_node_as_int" (node @-> returning int)
@@ -126,9 +142,13 @@ module Functions (F : Ctypes.FOREIGN) = struct
 
     let length = foreign "lilv_nodes_size" (nodes @-> returning int)
     let iterate = foreign "lilv_nodes_begin" (nodes @-> returning iterator)
-    let get = foreign "lilv_nodes_get" (nodes @-> iterator @-> returning plugin)
-    let next = foreign "lilv_nodes_next" (nodes @-> iterator @-> returning iterator)
-    let is_end = foreign "lilv_nodes_is_end" (nodes @-> iterator @-> returning bool)
+    let get = foreign "lilv_nodes_get" (nodes @-> iterator @-> returning nodes)
+
+    let next =
+      foreign "lilv_nodes_next" (nodes @-> iterator @-> returning iterator)
+
+    let is_end =
+      foreign "lilv_nodes_is_end" (nodes @-> iterator @-> returning bool)
   end
 
   module Port = struct
@@ -139,12 +159,25 @@ module Functions (F : Ctypes.FOREIGN) = struct
     let get_plugin (p : t) = snd (fst p)
     let get_port (p : t) = snd p
 
-    let is_a = foreign "lilv_port_is_a" (plugin @-> port @-> node @-> returning bool)
-    let has_property = foreign "lilv_port_has_property" (plugin @-> port @-> node @-> returning bool)
-    let index = foreign "lilv_port_get_index" (plugin @-> port @-> returning uint32_t)
-    let symbol = foreign "lilv_port_get_symbol" (plugin @-> port @-> returning node)
+    let is_a =
+      foreign "lilv_port_is_a" (plugin @-> port @-> node @-> returning bool)
+
+    let has_property =
+      foreign "lilv_port_has_property"
+        (plugin @-> port @-> node @-> returning bool)
+
+    let index =
+      foreign "lilv_port_get_index" (plugin @-> port @-> returning uint32_t)
+
+    let symbol =
+      foreign "lilv_port_get_symbol" (plugin @-> port @-> returning const_node)
+
     let name = foreign "lilv_port_get_name" (plugin @-> port @-> returning node)
-    let range = foreign "lilv_port_get_range" (plugin @-> port @-> ptr node @-> ptr node @-> ptr node @-> returning void)
+
+    let range =
+      foreign "lilv_port_get_range"
+        (plugin @-> port @-> ptr node @-> ptr node @-> ptr node
+       @-> returning void)
   end
 
   module Plugin = struct
@@ -153,39 +186,69 @@ module Functions (F : Ctypes.FOREIGN) = struct
     let make w p : t = (w, p)
     let get_world (p : t) = fst p
     let get_plugin (p : t) = snd p
-    let uri = foreign "lilv_plugin_get_uri" (plugin @-> returning node)
+    let uri = foreign "lilv_plugin_get_uri" (plugin @-> returning const_node)
     let name = foreign "lilv_plugin_get_name" (plugin @-> returning node)
-    let author_name = foreign "lilv_plugin_get_author_name" (plugin @-> returning node_opt)
-    let author_email = foreign "lilv_plugin_get_author_email" (plugin @-> returning node_opt)
-    let author_homepage = foreign "lilv_plugin_get_author_homepage" (plugin @-> returning node_opt)
+
+    let author_name =
+      foreign "lilv_plugin_get_author_name" (plugin @-> returning node_opt)
+
+    let author_email =
+      foreign "lilv_plugin_get_author_email" (plugin @-> returning node_opt)
+
+    let author_homepage =
+      foreign "lilv_plugin_get_author_homepage" (plugin @-> returning node_opt)
 
     module Class = struct
       type t = plugin_class
 
-      let label = foreign "lilv_plugin_class_get_label" (plugin_class @-> returning node)
+      let label =
+        foreign "lilv_plugin_class_get_label"
+          (plugin_class @-> returning const_node)
     end
 
-    let plugin_class = foreign "lilv_plugin_get_class" (plugin @-> returning plugin_class)
-    let supported_features = foreign "lilv_plugin_get_supported_features" (plugin @-> returning nodes)
-    let required_features = foreign "lilv_plugin_get_required_features" (plugin @-> returning nodes)
-    let optional_features = foreign "lilv_plugin_get_optional_features" (plugin @-> returning nodes)
-    let num_ports = foreign "lilv_plugin_get_num_ports" (plugin @-> returning int32_t)
-    let is_replaced = foreign "lilv_plugin_is_replaced" (plugin @-> returning bool)
-    let port_by_index = foreign "lilv_plugin_get_port_by_index" (plugin @-> int32_t @-> returning port)
-    let port_by_symbol = foreign "lilv_plugin_get_port_by_symbol" (plugin @-> node @-> returning port)
-    let has_latency = foreign "lilv_plugin_has_latency" (plugin @-> returning bool)
-    let latency_port_index = foreign "lilv_plugin_get_latency_port_index" (plugin @-> returning int32_t)
+    let plugin_class =
+      foreign "lilv_plugin_get_class" (plugin @-> returning plugin_class)
+
+    let supported_features =
+      foreign "lilv_plugin_get_supported_features" (plugin @-> returning nodes)
+
+    let required_features =
+      foreign "lilv_plugin_get_required_features" (plugin @-> returning nodes)
+
+    let optional_features =
+      foreign "lilv_plugin_get_optional_features" (plugin @-> returning nodes)
+
+    let num_ports =
+      foreign "lilv_plugin_get_num_ports" (plugin @-> returning int32_t)
+
+    let is_replaced =
+      foreign "lilv_plugin_is_replaced" (plugin @-> returning bool)
+
+    let port_by_index =
+      foreign "lilv_plugin_get_port_by_index"
+        (plugin @-> int32_t @-> returning port)
+
+    let port_by_symbol =
+      foreign "lilv_plugin_get_port_by_symbol"
+        (plugin @-> node @-> returning port)
+
+    let has_latency =
+      foreign "lilv_plugin_has_latency" (plugin @-> returning bool)
+
+    let latency_port_index =
+      foreign "lilv_plugin_get_latency_port_index" (plugin @-> returning int32_t)
 
     module Instance = struct
       type t = instance
 
       let free = foreign "lilv_instance_free" (instance @-> returning void)
-
       let descriptor (i : t) = getf !@i instance_impl_descriptor
       let handle (i : t) = getf !@i instance_impl_handle
     end
 
-    let instantiate = foreign "lilv_plugin_instantiate" (plugin @-> double @-> ptr void @-> returning instance)
+    let instantiate =
+      foreign "lilv_plugin_instantiate"
+        (plugin @-> double @-> ptr void @-> returning instance)
   end
 
   module Plugins = struct
@@ -197,10 +260,20 @@ module Functions (F : Ctypes.FOREIGN) = struct
     let get_plugins (p : t) = snd p
     let length = foreign "lilv_plugins_size" (plugins @-> returning int)
     let iterate = foreign "lilv_plugins_begin" (plugins @-> returning iterator)
-    let get = foreign "lilv_plugins_get" (plugins @-> iterator @-> returning plugin)
-    let get_by_uri = foreign "lilv_plugins_get_by_uri" (plugins @-> node @-> returning plugin_opt)
-    let next = foreign "lilv_plugins_next" (plugins @-> iterator @-> returning iterator)
-    let is_end = foreign "lilv_plugins_is_end" (plugins @-> iterator @-> returning bool)
+
+    let get =
+      foreign "lilv_plugins_get"
+        (plugins @-> iterator @-> returning const_plugin)
+
+    let get_by_uri =
+      foreign "lilv_plugins_get_by_uri"
+        (plugins @-> node @-> returning plugin_opt)
+
+    let next =
+      foreign "lilv_plugins_next" (plugins @-> iterator @-> returning iterator)
+
+    let is_end =
+      foreign "lilv_plugins_is_end" (plugins @-> iterator @-> returning bool)
   end
 
   module State = struct end