Make Optstring_val return const char *

[ocaml-libvirt.git] / libvirt / libvirt_c_epilogue.c

diff --git a/libvirt/libvirt_c_epilogue.c b/libvirt/libvirt_c_epilogue.c
index c7284b1..fcbe08e 100644 (file)
--- a/libvirt/libvirt_c_epilogue.c
+++ b/libvirt/libvirt_c_epilogue.c
@@ -20,7 +20,7 @@
 
 /* Please read libvirt/README file. */
 
-static char *
+static const char *
 Optstring_val (value strv)
 {
   if (strv == Val_int (0))     /* None */
@@ -100,6 +100,36 @@ _raise_virterror (const char *fn)
   (void) caml__frame;
 }
 
+static int
+_list_length (value listv)
+{
+  CAMLparam1 (listv);
+  int len = 0;
+
+  for (; listv != Val_emptylist; listv = Field (listv, 1), ++len) {}
+
+  CAMLreturnT (int, len);
+}
+
+static value
+Val_virconnectcredential (const virConnectCredentialPtr cred)
+{
+  CAMLparam0 ();
+  CAMLlocal1 (rv);
+
+  rv = caml_alloc (4, 0);
+  Store_field (rv, 0, Val_int (cred->type - 1));
+  Store_field (rv, 1, caml_copy_string (cred->prompt));
+  Store_field (rv, 2,
+               Val_opt_const (cred->challenge,
+                              (Val_const_ptr_t) caml_copy_string));
+  Store_field (rv, 3,
+               Val_opt_const (cred->defresult,
+                              (Val_const_ptr_t) caml_copy_string));
+
+  CAMLreturn (rv);
+}
+
 /* Convert the virErrorNumber, virErrorDomain and virErrorLevel enums
  * into values (longs because they are variants in OCaml).
  *
@@ -113,8 +143,8 @@ _raise_virterror (const char *fn)
  * to convert it into VIR_*_UNKNOWN (code).
  */
 
-#define MAX_VIR_CODE 50 /* VIR_ERR_NO_STORAGE_VOL */
-#define MAX_VIR_DOMAIN 17 /* VIR_FROM_STORAGE */
+#define MAX_VIR_CODE 101 /* VIR_ERR_NO_NWFILTER_BINDING */
+#define MAX_VIR_DOMAIN 67 /* VIR_FROM_RESCTRL */
 #define MAX_VIR_LEVEL VIR_ERR_ERROR
 
 static inline value
@@ -198,7 +228,7 @@ static void pol_finalize (value);
 static void vol_finalize (value);
 
 static struct custom_operations conn_custom_operations = {
-  "conn_custom_operations",
+  (char *) "conn_custom_operations",
   conn_finalize,
   custom_compare_default,
   custom_hash_default,
@@ -207,7 +237,7 @@ static struct custom_operations conn_custom_operations = {
 };
 
 static struct custom_operations dom_custom_operations = {
-  "dom_custom_operations",
+  (char *) "dom_custom_operations",
   dom_finalize,
   custom_compare_default,
   custom_hash_default,
@@ -217,7 +247,7 @@ static struct custom_operations dom_custom_operations = {
 };
 
 static struct custom_operations net_custom_operations = {
-  "net_custom_operations",
+  (char *) "net_custom_operations",
   net_finalize,
   custom_compare_default,
   custom_hash_default,
@@ -226,7 +256,7 @@ static struct custom_operations net_custom_operations = {
 };
 
 static struct custom_operations pol_custom_operations = {
-  "pol_custom_operations",
+  (char *) "pol_custom_operations",
   pol_finalize,
   custom_compare_default,
   custom_hash_default,
@@ -235,7 +265,7 @@ static struct custom_operations pol_custom_operations = {
 };
 
 static struct custom_operations vol_custom_operations = {
-  "vol_custom_operations",
+  (char *) "vol_custom_operations",
   vol_finalize,
   custom_compare_default,
   custom_hash_default,