X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Flibvirt_c_epilogue.c;h=ac69fcee4d81379713e6392a4bf09084ddce9746;hb=e54ab958bbbe8b773362a8dee91915ea87d4325a;hp=df1fabbae0b1df5710bfc79607f3fbc84c73ff31;hpb=c1a3b220af8f3fc74ba00fd0e54670c845950e4b;p=ocaml-libvirt.git

diff --git a/libvirt/libvirt_c_epilogue.c b/libvirt/libvirt_c_epilogue.c
index df1fabb..ac69fce 100644
--- a/libvirt/libvirt_c_epilogue.c
+++ b/libvirt/libvirt_c_epilogue.c
@@ -80,7 +80,8 @@ _raise_virterror (virConnectPtr conn, const char *fn)
   caml_raise_with_arg (*caml_named_value ("ocaml_libvirt_virterror"), rv);
 
   /*NOTREACHED*/
-  CAMLreturn0;
+  /* Suppresses a compiler warning. */
+  (void) caml__frame;
 }
 
 /* Raise an error if a function is not supported. */
@@ -94,7 +95,8 @@ not_supported (const char *fn)
   caml_raise_with_arg (*caml_named_value ("ocaml_libvirt_not_supported"), fnv);
 
   /*NOTREACHED*/
-  CAMLreturn0;
+  /* Suppresses a compiler warning. */
+  (void) caml__frame;
 }
 
 /* Convert the virErrorNumber, virErrorDomain and virErrorLevel enums
@@ -197,9 +199,6 @@ static void pol_finalize (value);
 #ifdef HAVE_VIRSTORAGEVOLPTR
 static void vol_finalize (value);
 #endif
-#ifdef HAVE_VIRJOBPTR
-static void jb_finalize (value);
-#endif
 
 static struct custom_operations conn_custom_operations = {
   "conn_custom_operations",
@@ -251,17 +250,6 @@ static struct custom_operations vol_custom_operations = {
 };
 #endif
 
-#ifdef HAVE_VIRJOBPTR
-static struct custom_operations jb_custom_operations = {
-  "jb_custom_operations",
-  jb_finalize,
-  custom_compare_default,
-  custom_hash_default,
-  custom_serialize_default,
-  custom_deserialize_default
-};
-#endif
-
 static value
 Val_connect (virConnectPtr conn)
 {
@@ -321,19 +309,6 @@ Val_vol (virStorageVolPtr vol)
 }
 #endif
 
-#ifdef HAVE_VIRJOBPTR
-static value
-Val_jb (virJobPtr jb)
-{
-  CAMLparam0 ();
-  CAMLlocal1 (rv);
-  rv = caml_alloc_custom (&jb_custom_operations,
-			  sizeof (virJobPtr), 0, 1);
-  Jb_val (rv) = jb;
-  CAMLreturn (rv);
-}
-#endif
-
 /* This wraps up the (dom, conn) pair (Domain.t). */
 static value
 Val_domain (virDomainPtr dom, value connv)
@@ -394,22 +369,6 @@ Val_volume (virStorageVolPtr vol, value connv)
 }
 #endif
 
-#ifdef HAVE_VIRJOBPTR
-/* This wraps up the (jb, conn) pair (Job.t). */
-static value
-Val_job (virJobPtr jb, value connv)
-{
-  CAMLparam1 (connv);
-  CAMLlocal2 (rv, v);
-
-  rv = caml_alloc_tuple (2);
-  v = Val_jb (jb);
-  Store_field (rv, 0, v);
-  Store_field (rv, 1, connv);
-  CAMLreturn (rv);
-}
-#endif
-
 static void
 conn_finalize (value connv)
 {
@@ -448,12 +407,3 @@ vol_finalize (value volv)
   if (vol) (void) virStorageVolFree (vol);
 }
 #endif
-
-#ifdef HAVE_VIRJOBPTR
-static void
-jb_finalize (value jbv)
-{
-  virJobPtr jb = Jb_val (jbv);
-  if (jb) (void) virJobFree (jb);
-}
-#endif