ruby-libvirt 0.5.2 → 0.8.0

data/ext/libvirt/network.c

@@ -2,7 +2,7 @@
  * network.c: virNetwork methods
  *
  * Copyright (C) 2007,2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013-2016 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -48,7 +48,7 @@ VALUE ruby_libvirt_network_new(virNetworkPtr n, VALUE conn)
  * call-seq:
  *   net.undefine -> nil
  *
- * Call virNetworkUndefine[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkUndefine]
+ * Call virNetworkUndefine[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkUndefine]
  * to undefine this network.
  */
 static VALUE libvirt_network_undefine(VALUE n)
@@ -62,7 +62,7 @@ static VALUE libvirt_network_undefine(VALUE n)
  * call-seq:
  *   net.create -> nil
  *
- * Call virNetworkCreate[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkCreate]
+ * Call virNetworkCreate[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkCreate]
  * to start this network.
  */
 static VALUE libvirt_network_create(VALUE n)
@@ -77,7 +77,7 @@ static VALUE libvirt_network_create(VALUE n)
  * call-seq:
  *   net.update -> nil
  *
- * Call virNetworkUpdate[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkUpdate]
+ * Call virNetworkUpdate[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkUpdate]
  * to update this network.
  */
 static VALUE libvirt_network_update(VALUE n, VALUE command, VALUE section,
@@ -95,7 +95,7 @@ static VALUE libvirt_network_update(VALUE n, VALUE command, VALUE section,
  * call-seq:
  *   net.destroy -> nil
  *
- * Call virNetworkDestroy[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkDestroy]
+ * Call virNetworkDestroy[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkDestroy]
  * to shutdown this network.
  */
 static VALUE libvirt_network_destroy(VALUE n)
@@ -107,9 +107,9 @@ static VALUE libvirt_network_destroy(VALUE n)
 
 /*
  * call-seq:
- *   net.name -> string
+ *   net.name -> String
  *
- * Call virNetworkGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetName]
+ * Call virNetworkGetName[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetName]
  * to retrieve the name of this network.
  */
 static VALUE libvirt_network_name(VALUE n)
@@ -121,9 +121,9 @@ static VALUE libvirt_network_name(VALUE n)
 
 /*
  * call-seq:
- *   net.uuid -> string
+ *   net.uuid -> String
  *
- * Call virNetworkGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetUUIDString]
+ * Call virNetworkGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetUUIDString]
  * to retrieve the UUID of this network.
  */
 static VALUE libvirt_network_uuid(VALUE n)
@@ -134,14 +134,14 @@ static VALUE libvirt_network_uuid(VALUE n)
 
 /*
  * call-seq:
- *   net.xml_desc(flags=0) -> string
+ *   net.xml_desc(flags=0) -> String
  *
- * Call virNetworkGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetXMLDesc]
+ * Call virNetworkGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetXMLDesc]
  * to retrieve the XML for this network.
  */
 static VALUE libvirt_network_xml_desc(int argc, VALUE *argv, VALUE n)
 {
-    VALUE flags;
+    VALUE flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "01", &flags);
 
@@ -153,9 +153,9 @@ static VALUE libvirt_network_xml_desc(int argc, VALUE *argv, VALUE n)
 
 /*
  * call-seq:
- *   net.bridge_name -> string
+ *   net.bridge_name -> String
  *
- * Call virNetworkGetBridgeName[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetBridgeName]
+ * Call virNetworkGetBridgeName[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetBridgeName]
  * to retrieve the bridge name for this network.
  */
 static VALUE libvirt_network_bridge_name(VALUE n)
@@ -169,7 +169,7 @@ static VALUE libvirt_network_bridge_name(VALUE n)
  * call-seq:
  *   net.autostart? -> [true|false]
  *
- * Call virNetworkGetAutostart[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkGetAutostart]
+ * Call virNetworkGetAutostart[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetAutostart]
  * to determine if this network will be autostarted when libvirtd starts.
  */
 static VALUE libvirt_network_autostart(VALUE n)
@@ -187,7 +187,7 @@ static VALUE libvirt_network_autostart(VALUE n)
  * call-seq:
  *   net.autostart = [true|false]
  *
- * Call virNetworkSetAutostart[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkSetAutostart]
+ * Call virNetworkSetAutostart[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkSetAutostart]
  * to set this network to be autostarted when libvirtd starts.
  */
 static VALUE libvirt_network_autostart_equal(VALUE n, VALUE autostart)
@@ -206,7 +206,7 @@ static VALUE libvirt_network_autostart_equal(VALUE n, VALUE autostart)
  * call-seq:
  *   net.free -> nil
  *
- * Call virNetworkFree[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkFree]
+ * Call virNetworkFree[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkFree]
  * to free this network.  The object will no longer be valid after this call.
  */
 static VALUE libvirt_network_free(VALUE n)
@@ -219,7 +219,7 @@ static VALUE libvirt_network_free(VALUE n)
  * call-seq:
  *   net.active? -> [true|false]
  *
- * Call virNetworkIsActive[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkIsActive]
+ * Call virNetworkIsActive[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkIsActive]
  * to determine if this network is currently active.
  */
 static VALUE libvirt_network_active_p(VALUE n)
@@ -235,7 +235,7 @@ static VALUE libvirt_network_active_p(VALUE n)
  * call-seq:
  *   net.persistent? -> [true|false]
  *
- * Call virNetworkIsPersistent[http://www.libvirt.org/html/libvirt-libvirt.html#virNetworkIsPersistent]
+ * Call virNetworkIsPersistent[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkIsPersistent]
  * to determine if this network is persistent.
  */
 static VALUE libvirt_network_persistent_p(VALUE n)
@@ -246,6 +246,92 @@ static VALUE libvirt_network_persistent_p(VALUE n)
 }
 #endif
 
+#if HAVE_VIRNETWORKGETDHCPLEASES
+struct leases_arg {
+    virNetworkDHCPLeasePtr *leases;
+    int nleases;
+};
+
+static VALUE leases_wrap(VALUE arg)
+{
+    struct leases_arg *e = (struct leases_arg *)arg;
+    VALUE result, hash;
+    virNetworkDHCPLeasePtr lease;
+    int i;
+
+    result = rb_ary_new2(e->nleases);
+
+    for (i = 0; i < e->nleases; i++) {
+        lease = e->leases[i];
+
+        hash = rb_hash_new();
+        rb_hash_aset(hash, rb_str_new2("iface"), rb_str_new2(lease->iface));
+        rb_hash_aset(hash, rb_str_new2("expirytime"),
+                     LL2NUM(lease->expirytime));
+        rb_hash_aset(hash, rb_str_new2("type"), INT2NUM(lease->type));
+        if (lease->mac) {
+            rb_hash_aset(hash, rb_str_new2("mac"), rb_str_new2(lease->mac));
+        }
+        if (lease->iaid) {
+            rb_hash_aset(hash, rb_str_new2("iaid"), rb_str_new2(lease->iaid));
+        }
+        rb_hash_aset(hash, rb_str_new2("ipaddr"), rb_str_new2(lease->ipaddr));
+        rb_hash_aset(hash, rb_str_new2("prefix"), UINT2NUM(lease->prefix));
+        if (lease->hostname) {
+            rb_hash_aset(hash, rb_str_new2("hostname"),
+                         rb_str_new2(lease->hostname));
+        }
+        if (lease->clientid) {
+            rb_hash_aset(hash, rb_str_new2("clientid"),
+                         rb_str_new2(lease->clientid));
+        }
+
+        rb_ary_store(result, i, hash);
+    }
+
+    return result;
+}
+
+/*
+ * call-seq:
+ *   net.dhcp_leases(mac=nil, flags=0) -> Hash
+ *
+ * Call virNetworkGetDHCPLeases[http://www.libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetDHCPLeases]
+ * to retrieve the leases for this network.
+ */
+static VALUE libvirt_network_get_dhcp_leases(int argc, VALUE *argv, VALUE n)
+{
+    VALUE mac = RUBY_Qnil, flags = RUBY_Qnil, result;
+    int nleases, i = 0, exception = 0;
+    virNetworkDHCPLeasePtr *leases = NULL;
+    struct leases_arg args;
+
+    rb_scan_args(argc, argv, "02", &mac, &flags);
+
+    nleases = virNetworkGetDHCPLeases(network_get(n),
+                                      ruby_libvirt_get_cstring_or_null(mac),
+                                      &leases,
+                                      ruby_libvirt_value_to_uint(flags));
+    ruby_libvirt_raise_error_if(nleases < 0, e_Error, "virNetworkGetDHCPLeases",
+                                ruby_libvirt_connect_get(n));
+
+    args.leases = leases;
+    args.nleases = nleases;
+    result = rb_protect(leases_wrap, (VALUE)&args, &exception);
+
+    for (i = 0; i < nleases; i++) {
+        virNetworkDHCPLeaseFree(leases[i]);
+    }
+    free(leases);
+
+    if (exception) {
+        rb_jump_tag(exception);
+    }
+
+    return result;
+}
+#endif
+
 #endif
 
 /*
@@ -450,5 +536,20 @@ void ruby_libvirt_network_init(void)
                     INT2NUM(VIR_NETWORK_UPDATE_COMMAND_DELETE));
 #endif
 
+#if HAVE_VIRNETWORKGETDHCPLEASES
+    rb_define_method(c_network, "dhcp_leases",
+                     libvirt_network_get_dhcp_leases, -1);
+#endif
+
+#if HAVE_CONST_VIR_IP_ADDR_TYPE_IPV4
+    rb_define_const(c_network, "IP_ADDR_TYPE_IPV4",
+                    INT2NUM(VIR_IP_ADDR_TYPE_IPV4));
+#endif
+
+#if HAVE_CONST_VIR_IP_ADDR_TYPE_IPV6
+    rb_define_const(c_network, "IP_ADDR_TYPE_IPV6",
+                    INT2NUM(VIR_IP_ADDR_TYPE_IPV6));
+#endif
+
 #endif
 }

data/ext/libvirt/nodedevice.c

@@ -2,7 +2,7 @@
  * nodedevice.c: virNodeDevice methods
  *
  * Copyright (C) 2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013-2016 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,9 +46,9 @@ VALUE ruby_libvirt_nodedevice_new(virNodeDevicePtr n, VALUE conn)
 
 /*
  * call-seq:
- *   nodedevice.name -> string
+ *   nodedevice.name -> String
  *
- * Call virNodeDeviceGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetName]
+ * Call virNodeDeviceGetName[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetName]
  * to retrieve the name of the node device.
  */
 static VALUE libvirt_nodedevice_name(VALUE c)
@@ -60,9 +60,9 @@ static VALUE libvirt_nodedevice_name(VALUE c)
 
 /*
  * call-seq:
- *   nodedevice.parent -> string
+ *   nodedevice.parent -> String
  *
- * Call virNodeDeviceGetParent[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetParent]
+ * Call virNodeDeviceGetParent[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetParent]
  * to retrieve the parent of the node device.
  */
 static VALUE libvirt_nodedevice_parent(VALUE c)
@@ -85,9 +85,9 @@ static VALUE libvirt_nodedevice_parent(VALUE c)
 
 /*
  * call-seq:
- *   nodedevice.num_of_caps -> fixnum
+ *   nodedevice.num_of_caps -> Fixnum
  *
- * Call virNodeDeviceNumOfCaps[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceNumOfCaps]
+ * Call virNodeDeviceNumOfCaps[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceNumOfCaps]
  * to retrieve the number of capabilities of the node device.
  */
 static VALUE libvirt_nodedevice_num_of_caps(VALUE c)
@@ -101,7 +101,7 @@ static VALUE libvirt_nodedevice_num_of_caps(VALUE c)
  * call-seq:
  *   nodedevice.list_caps -> list
  *
- * Call virNodeDeviceListCaps[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceListCaps]
+ * Call virNodeDeviceListCaps[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceListCaps]
  * to retrieve a list of capabilities of the node device.
  */
 static VALUE libvirt_nodedevice_list_caps(VALUE c)
@@ -129,14 +129,14 @@ static VALUE libvirt_nodedevice_list_caps(VALUE c)
 
 /*
  * call-seq:
- *   nodedevice.xml_desc(flags=0) -> string
+ *   nodedevice.xml_desc(flags=0) -> String
  *
- * Call virNodeDeviceGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceGetXMLDesc]
+ * Call virNodeDeviceGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceGetXMLDesc]
  * to retrieve the XML for the node device.
  */
 static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE n)
 {
-    VALUE flags;
+    VALUE flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "01", &flags);
 
@@ -150,12 +150,12 @@ static VALUE libvirt_nodedevice_xml_desc(int argc, VALUE *argv, VALUE n)
  * call-seq:
  *   nodedevice.detach(driver=nil, flags=0) -> nil
  *
- * Call virNodeDeviceDettach[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDettach]
+ * Call virNodeDeviceDettach[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceDettach]
  * to detach the node device from the node.
  */
 static VALUE libvirt_nodedevice_detach(int argc, VALUE *argv, VALUE n)
 {
-    VALUE driver, flags;
+    VALUE driver = RUBY_Qnil, flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "02", &driver, &flags);
 
@@ -184,7 +184,7 @@ static VALUE libvirt_nodedevice_detach(int argc, VALUE *argv, VALUE n)
  * call-seq:
  *   nodedevice.reattach -> nil
  *
- * Call virNodeDeviceReAttach[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReAttach]
+ * Call virNodeDeviceReAttach[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceReAttach]
  * to reattach the node device to the node.
  */
 static VALUE libvirt_nodedevice_reattach(VALUE n)
@@ -198,7 +198,7 @@ static VALUE libvirt_nodedevice_reattach(VALUE n)
  * call-seq:
  *   nodedevice.reset -> nil
  *
- * Call virNodeDeviceReset[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceReset]
+ * Call virNodeDeviceReset[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceReset]
  * to reset the node device.
  */
 static VALUE libvirt_nodedevice_reset(VALUE n)
@@ -213,7 +213,7 @@ static VALUE libvirt_nodedevice_reset(VALUE n)
  * call-seq:
  *   nodedevice.destroy -> nil
  *
- * Call virNodeDeviceDestroy[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceDestroy]
+ * Call virNodeDeviceDestroy[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceDestroy]
  * to shutdown the node device.
  */
 static VALUE libvirt_nodedevice_destroy(VALUE n)
@@ -228,7 +228,7 @@ static VALUE libvirt_nodedevice_destroy(VALUE n)
  * call-seq:
  *   nodedevice.free -> nil
  *
- * Call virNodeDeviceFree[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceFree]
+ * Call virNodeDeviceFree[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceFree]
  * to free the node device object.  After this call the node device object is
  * no longer valid.
  */
@@ -242,13 +242,13 @@ static VALUE libvirt_nodedevice_free(VALUE n)
  * call-seq:
  *   nodedevice.lookup_scsi_host_by_wwn(wwnn, wwpn, flags=0) -> Libvirt::NodeDevice
  *
- * Call virNodeDeviceLookupSCSIHostByWWN[http://www.libvirt.org/html/libvirt-libvirt.html#virNodeDeviceLookupSCSIHostByWWN]
+ * Call virNodeDeviceLookupSCSIHostByWWN[http://www.libvirt.org/html/libvirt-libvirt-nodedev.html#virNodeDeviceLookupSCSIHostByWWN]
  * to look up a SCSI host by its WWNN and WWPN.
  */
 static VALUE libvirt_nodedevice_lookup_scsi_host_by_wwn(int argc, VALUE *argv,
                                                         VALUE n)
 {
-    VALUE wwnn, wwpn, flags;
+    VALUE wwnn, wwpn, flags = RUBY_Qnil;
     virNodeDevicePtr nd;
 
     rb_scan_args(argc, argv, "21", &wwnn, &wwpn, &flags);

data/ext/libvirt/nwfilter.c

@@ -2,7 +2,7 @@
  * nwfilter.c: virNWFilter methods
  *
  * Copyright (C) 2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013-2016 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -48,7 +48,7 @@ VALUE ruby_libvirt_nwfilter_new(virNWFilterPtr n, VALUE conn)
  * call-seq:
  *   nwfilter.undefine -> nil
  *
- * Call virNWFilterUndefine[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterUndefine]
+ * Call virNWFilterUndefine[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterUndefine]
  * to undefine the network filter.
  */
 static VALUE libvirt_nwfilter_undefine(VALUE n)
@@ -60,9 +60,9 @@ static VALUE libvirt_nwfilter_undefine(VALUE n)
 
 /*
  * call-seq:
- *   nwfilter.name -> string
+ *   nwfilter.name -> String
  *
- * Call virNWFilterGetName[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetName]
+ * Call virNWFilterGetName[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetName]
  * to retrieve the network filter name.
  */
 static VALUE libvirt_nwfilter_name(VALUE n)
@@ -74,9 +74,9 @@ static VALUE libvirt_nwfilter_name(VALUE n)
 
 /*
  * call-seq:
- *   nwfilter.uuid -> string
+ *   nwfilter.uuid -> String
  *
- * Call virNWFilterGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetUUIDString]
+ * Call virNWFilterGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetUUIDString]
  * to retrieve the network filter UUID.
  */
 static VALUE libvirt_nwfilter_uuid(VALUE n)
@@ -87,14 +87,14 @@ static VALUE libvirt_nwfilter_uuid(VALUE n)
 
 /*
  * call-seq:
- *   nwfilter.xml_desc(flags=0) -> string
+ *   nwfilter.xml_desc(flags=0) -> String
  *
- * Call virNWFilterGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterGetXMLDesc]
+ * Call virNWFilterGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterGetXMLDesc]
  * to retrieve the XML for this network filter.
  */
 static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE n)
 {
-    VALUE flags;
+    VALUE flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "01", &flags);
 
@@ -108,7 +108,7 @@ static VALUE libvirt_nwfilter_xml_desc(int argc, VALUE *argv, VALUE n)
  * call-seq:
  *   nwfilter.free -> nil
  *
- * Call virNWFilterFree[http://www.libvirt.org/html/libvirt-libvirt.html#virNWFilterFree]
+ * Call virNWFilterFree[http://www.libvirt.org/html/libvirt-libvirt-nwfilter.html#virNWFilterFree]
  * to free this network filter.  After this call the network filter object is
  * no longer valid.
  */

data/ext/libvirt/secret.c

@@ -2,7 +2,7 @@
  * secret.c: virSecret methods
  *
  * Copyright (C) 2010 Red Hat Inc.
- * Copyright (C) 2013 Chris Lalancette <clalancette@gmail.com>
+ * Copyright (C) 2013-2016 Chris Lalancette <clalancette@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,9 +46,9 @@ VALUE ruby_libvirt_secret_new(virSecretPtr s, VALUE conn)
 
 /*
  * call-seq:
- *   secret.uuid -> string
+ *   secret.uuid -> String
  *
- * Call virSecretGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUUIDString]
+ * Call virSecretGetUUIDString[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUUIDString]
  * to retrieve the UUID for this secret.
  */
 static VALUE libvirt_secret_uuid(VALUE s)
@@ -59,9 +59,9 @@ static VALUE libvirt_secret_uuid(VALUE s)
 
 /*
  * call-seq:
- *   secret.usagetype -> fixnum
+ *   secret.usagetype -> Fixnum
  *
- * Call virSecretGetUsageType[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUsageType]
+ * Call virSecretGetUsageType[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUsageType]
  * to retrieve the usagetype for this secret.
  */
 static VALUE libvirt_secret_usagetype(VALUE s)
@@ -73,9 +73,9 @@ static VALUE libvirt_secret_usagetype(VALUE s)
 
 /*
  * call-seq:
- *   secret.usageid -> string
+ *   secret.usageid -> String
  *
- * Call virSecretGetUsageID[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetUsageID]
+ * Call virSecretGetUsageID[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetUsageID]
  * to retrieve the usageid for this secret.
  */
 static VALUE libvirt_secret_usageid(VALUE s)
@@ -87,14 +87,14 @@ static VALUE libvirt_secret_usageid(VALUE s)
 
 /*
  * call-seq:
- *   secret.xml_desc(flags=0) -> string
+ *   secret.xml_desc(flags=0) -> String
  *
- * Call virSecretGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetXMLDesc]
+ * Call virSecretGetXMLDesc[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetXMLDesc]
  * to retrieve the XML for this secret.
  */
 static VALUE libvirt_secret_xml_desc(int argc, VALUE *argv, VALUE s)
 {
-    VALUE flags;
+    VALUE flags = RUBY_Qnil;
 
     rb_scan_args(argc, argv, "01", &flags);
 
@@ -108,12 +108,12 @@ static VALUE libvirt_secret_xml_desc(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   secret.set_value(value, flags=0) -> nil
  *
- * Call virSecretSetValue[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretSetValue]
+ * Call virSecretSetValue[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue]
  * to set a new value in this secret.  Deprecated; use secret.value= instead.
  */
 static VALUE libvirt_secret_set_value(int argc, VALUE *argv, VALUE s)
 {
-    VALUE flags, value;
+    VALUE flags = RUBY_Qnil, value;
 
     rb_scan_args(argc, argv, "11", &value, &flags);
 
@@ -131,7 +131,7 @@ static VALUE libvirt_secret_set_value(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   secret.value = value,flags=0
  *
- * Call virSecretSetValue[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretSetValue]
+ * Call virSecretSetValue[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretSetValue]
  * to set a new value in this secret.
  */
 static VALUE libvirt_secret_value_equal(VALUE s, VALUE in)
@@ -166,14 +166,14 @@ static VALUE libvirt_secret_value_equal(VALUE s, VALUE in)
 
 /*
  * call-seq:
- *   secret.value(flags=0) -> string
+ *   secret.value(flags=0) -> String
  *
- * Call virSecretGetValue[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretGetValue]
+ * Call virSecretGetValue[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretGetValue]
  * to retrieve the value from this secret.
  */
 static VALUE libvirt_secret_value(int argc, VALUE *argv, VALUE s)
 {
-    VALUE flags, ret;
+    VALUE flags = RUBY_Qnil, ret;
     unsigned char *val;
     size_t value_size;
     int exception = 0;
@@ -203,7 +203,7 @@ static VALUE libvirt_secret_value(int argc, VALUE *argv, VALUE s)
  * call-seq:
  *   secret.undefine -> nil
  *
- * Call virSecretUndefine[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretUndefine]
+ * Call virSecretUndefine[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretUndefine]
  * to undefine this secret.
  */
 static VALUE libvirt_secret_undefine(VALUE s)
@@ -217,7 +217,7 @@ static VALUE libvirt_secret_undefine(VALUE s)
  * call-seq:
  *   secret.free -> nil
  *
- * Call virSecretFree[http://www.libvirt.org/html/libvirt-libvirt.html#virSecretFree]
+ * Call virSecretFree[http://www.libvirt.org/html/libvirt-libvirt-secret.html#virSecretFree]
  * to free this secret.  After this call the secret object is no longer valid.
  */
 static VALUE libvirt_secret_free(VALUE s)