X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml%2Fguestfs.ml;h=fba005f65ade614000c4099ff72bc54c80219609;hb=3acec39588bd574a616fa0671a29cd1280f356fb;hp=ba6f0d64d5e9835fc22d51b67d13c8fddf25922d;hpb=4144e2106cc70ad8f1e081b57da09f9c1e276812;p=libguestfs.git

diff --git a/ocaml/guestfs.ml b/ocaml/guestfs.ml
index ba6f0d6..fba005f 100644
--- a/ocaml/guestfs.ml
+++ b/ocaml/guestfs.ml
@@ -22,19 +22,10 @@
 type t
 exception Error of string
 external create : unit -> t = "ocaml_guestfs_create"
-external close : t -> unit = "ocaml_guestfs_create"
-external launch : t -> unit = "ocaml_guestfs_launch"
-external wait_ready : t -> unit = "ocaml_guestfs_wait_ready"
-external kill_subprocess : t -> unit = "ocaml_guestfs_kill_subprocess"
-external add_drive : t -> string -> unit = "ocaml_guestfs_add_drive"
-external add_cdrom : t -> string -> unit = "ocaml_guestfs_add_cdrom"
-external config : t -> string -> string option -> unit = "ocaml_guestfs_config"
-external set_path : t -> string option -> unit = "ocaml_guestfs_set_path"
-external get_path : t -> string = "ocaml_guestfs_get_path"
-external set_autosync : t -> bool -> unit = "ocaml_guestfs_set_autosync"
-external get_autosync : t -> bool = "ocaml_guestfs_get_autosync"
-external set_verbose : t -> bool -> unit = "ocaml_guestfs_set_verbose"
-external get_verbose : t -> bool = "ocaml_guestfs_get_verbose"
+external close : t -> unit = "ocaml_guestfs_close"
+
+let () =
+  Callback.register_exception "ocaml_guestfs_error" (Error "")
 
 type lvm_pv = {
   pv_name : string;
@@ -94,17 +85,43 @@ type lvm_lv = {
   modules : string;
 }
 
-external cat : t -> string -> string = "ocaml_guestfs_cat"
-external list_devices : t -> string list = "ocaml_guestfs_list_devices"
-external list_partitions : t -> string list = "ocaml_guestfs_list_partitions"
-external ll : t -> string -> string = "ocaml_guestfs_ll"
-external ls : t -> string -> string list = "ocaml_guestfs_ls"
-external lvs : t -> string list = "ocaml_guestfs_lvs"
-external lvs_full : t -> lvm_lv list = "ocaml_guestfs_lvs_full"
+external launch : t -> unit = "ocaml_guestfs_launch"
+external wait_ready : t -> unit = "ocaml_guestfs_wait_ready"
+external kill_subprocess : t -> unit = "ocaml_guestfs_kill_subprocess"
+external add_drive : t -> string -> unit = "ocaml_guestfs_add_drive"
+external add_cdrom : t -> string -> unit = "ocaml_guestfs_add_cdrom"
+external config : t -> string -> string option -> unit = "ocaml_guestfs_config"
+external set_path : t -> string -> unit = "ocaml_guestfs_set_path"
+external get_path : t -> string = "ocaml_guestfs_get_path"
+external set_autosync : t -> bool -> unit = "ocaml_guestfs_set_autosync"
+external get_autosync : t -> bool = "ocaml_guestfs_get_autosync"
+external set_verbose : t -> bool -> unit = "ocaml_guestfs_set_verbose"
+external get_verbose : t -> bool = "ocaml_guestfs_get_verbose"
 external mount : t -> string -> string -> unit = "ocaml_guestfs_mount"
-external pvs : t -> string list = "ocaml_guestfs_pvs"
-external pvs_full : t -> lvm_pv list = "ocaml_guestfs_pvs_full"
 external sync : t -> unit = "ocaml_guestfs_sync"
 external touch : t -> string -> unit = "ocaml_guestfs_touch"
-external vgs : t -> string list = "ocaml_guestfs_vgs"
-external vgs_full : t -> lvm_vg list = "ocaml_guestfs_vgs_full"
+external cat : t -> string -> string = "ocaml_guestfs_cat"
+external ll : t -> string -> string = "ocaml_guestfs_ll"
+external ls : t -> string -> string array = "ocaml_guestfs_ls"
+external list_devices : t -> string array = "ocaml_guestfs_list_devices"
+external list_partitions : t -> string array = "ocaml_guestfs_list_partitions"
+external pvs : t -> string array = "ocaml_guestfs_pvs"
+external vgs : t -> string array = "ocaml_guestfs_vgs"
+external lvs : t -> string array = "ocaml_guestfs_lvs"
+external pvs_full : t -> lvm_pv array = "ocaml_guestfs_pvs_full"
+external vgs_full : t -> lvm_vg array = "ocaml_guestfs_vgs_full"
+external lvs_full : t -> lvm_lv array = "ocaml_guestfs_lvs_full"
+external read_lines : t -> string -> string array = "ocaml_guestfs_read_lines"
+external aug_init : t -> string -> int -> unit = "ocaml_guestfs_aug_init"
+external aug_close : t -> unit = "ocaml_guestfs_aug_close"
+external aug_defvar : t -> string -> string option -> int = "ocaml_guestfs_aug_defvar"
+external aug_defnode : t -> string -> string -> string -> int * bool = "ocaml_guestfs_aug_defnode"
+external aug_get : t -> string -> string = "ocaml_guestfs_aug_get"
+external aug_set : t -> string -> string -> unit = "ocaml_guestfs_aug_set"
+external aug_insert : t -> string -> string -> bool -> unit = "ocaml_guestfs_aug_insert"
+external aug_rm : t -> string -> int = "ocaml_guestfs_aug_rm"
+external aug_mv : t -> string -> string -> unit = "ocaml_guestfs_aug_mv"
+external aug_match : t -> string -> string array = "ocaml_guestfs_aug_match"
+external aug_save : t -> unit = "ocaml_guestfs_aug_save"
+external aug_load : t -> unit = "ocaml_guestfs_aug_load"
+external aug_ls : t -> string -> string array = "ocaml_guestfs_aug_ls"