git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Fix debug-upload command if compiled without --enable-debug.
[libguestfs.git]
/
ocaml
/
guestfs_c.c
diff --git
a/ocaml/guestfs_c.c
b/ocaml/guestfs_c.c
index
80dcf99
..
71f416a
100644
(file)
--- a/
ocaml/guestfs_c.c
+++ b/
ocaml/guestfs_c.c
@@
-93,6
+93,17
@@
ocaml_guestfs_raise_error (guestfs_h *g, const char *func)
CAMLnoreturn;
}
CAMLnoreturn;
}
+void
+ocaml_guestfs_raise_closed (const char *func)
+{
+ CAMLparam0 ();
+ CAMLlocal1 (v);
+
+ v = caml_copy_string (func);
+ caml_raise_with_arg (*caml_named_value ("ocaml_guestfs_closed"), v);
+ CAMLnoreturn;
+}
+
/* Guestfs.create */
CAMLprim value
ocaml_guestfs_create (void)
/* Guestfs.create */
CAMLprim value
ocaml_guestfs_create (void)
@@
-125,11
+136,7
@@
ocaml_guestfs_close (value gv)
CAMLreturn (Val_unit);
}
CAMLreturn (Val_unit);
}
-/* Copy string array value.
- * The return value is only 'safe' provided we don't allocate anything
- * further on the OCaml heap (ie. cannot trigger the OCaml GC) because
- * that could move the strings around.
- */
+/* Copy string array value. */
char **
ocaml_guestfs_strings_val (guestfs_h *g, value sv)
{
char **
ocaml_guestfs_strings_val (guestfs_h *g, value sv)
{
@@
-139,7
+146,7
@@
ocaml_guestfs_strings_val (guestfs_h *g, value sv)
r = guestfs_safe_malloc (g, sizeof (char *) * (Wosize_val (sv) + 1));
for (i = 0; i < Wosize_val (sv); ++i)
r = guestfs_safe_malloc (g, sizeof (char *) * (Wosize_val (sv) + 1));
for (i = 0; i < Wosize_val (sv); ++i)
- r[i] =
String_val (Field (sv, i
));
+ r[i] =
guestfs_safe_strdup (g, String_val (Field (sv, i)
));
r[i] = NULL;
CAMLreturnT (char **, r);
r[i] = NULL;
CAMLreturnT (char **, r);
@@
-149,8
+156,9
@@
ocaml_guestfs_strings_val (guestfs_h *g, value sv)
void
ocaml_guestfs_free_strings (char **argv)
{
void
ocaml_guestfs_free_strings (char **argv)
{
- /* Don't free the actual strings - they are String_vals on
- * the OCaml heap.
- */
+ unsigned int i;
+
+ for (i = 0; argv[i] != NULL; ++i)
+ free (argv[i]);
free (argv);
}
free (argv);
}