Pass the augeas_t to raise_error

[ocaml-augeas.git] / augeas-c.c

diff --git a/augeas-c.c b/augeas-c.c
index 3f5431b..7ca7244 100644 (file)
--- a/augeas-c.c
+++ b/augeas-c.c
@@ -33,7 +33,13 @@ typedef augeas *augeas_t;
 
 /* Raise an Augeas.Error exception. */
 static void
-raise_error (const char *msg)
+raise_error (augeas_t t, const char *msg)
+{
+  caml_raise_with_string (*caml_named_value ("Augeas.Error"), msg);
+}
+
+static void
+raise_init_error (const char *msg)
 {
   caml_raise_with_string (*caml_named_value ("Augeas.Error"), msg);
 }
@@ -111,7 +117,7 @@ ocaml_augeas_create (value rootv, value loadpathv, value flagsv)
   t = aug_init (root, loadpath, flags);
 
   if (t == NULL)
-    raise_error ("Augeas.create");
+    raise_init_error ("Augeas.create");
 
   CAMLreturn (Val_augeas_t (t));
 }
@@ -150,7 +156,7 @@ ocaml_augeas_get (value tv, value pathv)
   } else if (r == 0)           /* Return None */
     optv = Val_int (0);
   else if (r == -1)            /* Error or multiple matches */
-    raise_error ("Augeas.get");
+    raise_error (t, "Augeas.get");
   else
     failwith ("Augeas.get: bad return value");
 
@@ -173,7 +179,7 @@ ocaml_augeas_exists (value tv, value pathv)
   else if (r == 0)             /* Return false */
     v = Val_int (0);
   else if (r == -1)            /* Error or multiple matches */
-    raise_error ("Augeas.exists");
+    raise_error (t, "Augeas.exists");
   else
     failwith ("Augeas.exists: bad return value");
 
@@ -193,7 +199,7 @@ ocaml_augeas_insert (value tv, value beforev, value pathv, value labelv)
   before = beforev == Val_int (0) ? 0 : Int_val (Field (beforev, 0));
 
   if (aug_insert (t, path, label, before) == -1)
-    raise_error ("Augeas.insert");
+    raise_error (t, "Augeas.insert");
 
   CAMLreturn (Val_unit);
 }
@@ -209,7 +215,7 @@ ocaml_augeas_rm (value tv, value pathv)
 
   r = aug_rm (t, path);
   if (r == -1)
-    raise_error ("Augeas.rm");
+    raise_error (t, "Augeas.rm");
 
   CAMLreturn (Val_int (r));
 }
@@ -227,7 +233,7 @@ ocaml_augeas_match (value tv, value pathv)
 
   r = aug_match (t, path, &matches);
   if (r == -1)
-    raise_error ("Augeas.matches");
+    raise_error (t, "Augeas.matches");
 
   /* Copy the paths to a list. */
   rv = Val_int (0);
@@ -256,7 +262,7 @@ ocaml_augeas_count_matches (value tv, value pathv)
 
   r = aug_match (t, path, NULL);
   if (r == -1)
-    raise_error ("Augeas.count_matches");
+    raise_error (t, "Augeas.count_matches");
 
   CAMLreturn (Val_int (r));
 }
@@ -269,7 +275,20 @@ ocaml_augeas_save (value tv)
   augeas_t t = Augeas_t_val (tv);
 
   if (aug_save (t) == -1)
-    raise_error ("Augeas.save");
+    raise_error (t, "Augeas.save");
+
+  CAMLreturn (Val_unit);
+}
+
+/* val load : t -> unit */
+CAMLprim value
+ocaml_augeas_load (value tv)
+{
+  CAMLparam1 (tv);
+  augeas_t t = Augeas_t_val (tv);
+
+  if (aug_load (t) == -1)
+    raise_error (t, "Augeas.load");
 
   CAMLreturn (Val_unit);
 }