Through copy and paste from libvirt-gobject-connection.c, we end up with an instance variable named 'conn' in most of our classes even if we are not manipulating a connection object. This commit renames it all 'conn' occurrences in libvirt-gobject and libvirt-gconfig with a name more consistent with the type of the variable named 'conn'. --- .../libvirt-gconfig-domain-interface-bridge.c | 6 ++--- .../libvirt-gconfig-domain-interface-network.c | 6 ++--- .../libvirt-gconfig-domain-interface-user.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-domain.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-interface.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-network-filter.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-network.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-node-device.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-object.c | 12 +++++----- libvirt-gconfig/libvirt-gconfig-secret.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 6 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 6 ++--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-domain.c | 26 +++++++++++----------- libvirt-gobject/libvirt-gobject-interface.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-manager.c | 6 ++--- libvirt-gobject/libvirt-gobject-network-filter.c | 6 ++--- libvirt-gobject/libvirt-gobject-network.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-node-device.c | 20 ++++++++--------- libvirt-gobject/libvirt-gobject-secret.c | 24 ++++++++++---------- libvirt-gobject/libvirt-gobject-storage-pool.c | 4 ++-- libvirt-gobject/libvirt-gobject-storage-vol.c | 20 ++++++++--------- 23 files changed, 125 insertions(+), 125 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index fc2f359..c942200 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -45,11 +45,11 @@ static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInter } -static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *conn) +static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *bridge) { - g_debug("Init GVirConfigDomainInterfaceBridge=%p", conn); + g_debug("Init GVirConfigDomainInterfaceBridge=%p", bridge); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(conn); + bridge->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(bridge); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index a5f6270..8c0c920 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -44,11 +44,11 @@ static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInte } -static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *conn) +static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *iface) { - g_debug("Init GVirConfigDomainInterfaceNetwork=%p", conn); + g_debug("Init GVirConfigDomainInterfaceNetwork=%p", iface); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index a2b7219..2f844dd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -44,11 +44,11 @@ static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfa } -static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *conn) +static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *iface) { - g_debug("Init GVirConfigDomainInterfaceUser=%p", conn); + g_debug("Init GVirConfigDomainInterfaceUser=%p", iface); - conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index c46a23a..3d967f1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -42,11 +42,11 @@ static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass } -static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *conn) +static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *snapshot) { - g_debug("Init GVirConfigDomainSnapshot=%p", conn); + g_debug("Init GVirConfigDomainSnapshot=%p", snapshot); - conn->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); + snapshot->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 7ef0be8..eb97cd5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -188,11 +188,11 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) } -static void gvir_config_domain_init(GVirConfigDomain *conn) +static void gvir_config_domain_init(GVirConfigDomain *domain) { - g_debug("Init GVirConfigDomain=%p", conn); + g_debug("Init GVirConfigDomain=%p", domain); - conn->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(conn); + domain->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(domain); } diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 4b63091..521455c 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -42,11 +42,11 @@ static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) } -static void gvir_config_interface_init(GVirConfigInterface *conn) +static void gvir_config_interface_init(GVirConfigInterface *iface) { - g_debug("Init GVirConfigInterface=%p", conn); + g_debug("Init GVirConfigInterface=%p", iface); - conn->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(conn); + iface->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index 1efef7c..68c5c79 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -42,11 +42,11 @@ static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass * } -static void gvir_config_network_filter_init(GVirConfigNetworkFilter *conn) +static void gvir_config_network_filter_init(GVirConfigNetworkFilter *filter) { - g_debug("Init GVirConfigNetworkFilter=%p", conn); + g_debug("Init GVirConfigNetworkFilter=%p", filter); - conn->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(conn); + filter->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(filter); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index cd23aa6..e14b9c7 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -42,11 +42,11 @@ static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) } -static void gvir_config_network_init(GVirConfigNetwork *conn) +static void gvir_config_network_init(GVirConfigNetwork *network) { - g_debug("Init GVirConfigNetwork=%p", conn); + g_debug("Init GVirConfigNetwork=%p", network); - conn->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(conn); + network->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(network); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index e23cc7c..eab4aab 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -42,11 +42,11 @@ static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) } -static void gvir_config_node_device_init(GVirConfigNodeDevice *conn) +static void gvir_config_node_device_init(GVirConfigNodeDevice *device) { - g_debug("Init GVirConfigNodeDevice=%p", conn); + g_debug("Init GVirConfigNodeDevice=%p", device); - conn->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(conn); + device->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index d6e4bd8..9e3b5f2 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -120,10 +120,10 @@ static void gvir_config_object_set_property(GObject *object, static void gvir_config_object_finalize(GObject *object) { - GVirConfigObject *conn = GVIR_CONFIG_OBJECT(object); - GVirConfigObjectPrivate *priv = conn->priv; + GVirConfigObject *gvir_object = GVIR_CONFIG_OBJECT(object); + GVirConfigObjectPrivate *priv = gvir_object->priv; - g_debug("Finalize GVirConfigObject=%p", conn); + g_debug("Finalize GVirConfigObject=%p", gvir_object); g_free(priv->schema); @@ -182,11 +182,11 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) } -static void gvir_config_object_init(GVirConfigObject *conn) +static void gvir_config_object_init(GVirConfigObject *object) { - g_debug("Init GVirConfigObject=%p", conn); + g_debug("Init GVirConfigObject=%p", object); - conn->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(conn); + object->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(object); } void gvir_config_object_validate(GVirConfigObject *config, diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index fb268b0..c2dbcff 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -42,11 +42,11 @@ static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) } -static void gvir_config_secret_init(GVirConfigSecret *conn) +static void gvir_config_secret_init(GVirConfigSecret *secret) { - g_debug("Init GVirConfigSecret=%p", conn); + g_debug("Init GVirConfigSecret=%p", secret); - conn->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(conn); + secret->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(secret); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index b06c24c..87caeb6 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -44,11 +44,11 @@ static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klas } -static void gvir_config_storage_pool_init(GVirConfigStoragePool *conn) +static void gvir_config_storage_pool_init(GVirConfigStoragePool *pool) { - g_debug("Init GVirConfigStoragePool=%p", conn); + g_debug("Init GVirConfigStoragePool=%p", pool); - conn->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(conn); + pool->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(pool); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index e2a0ae8..6690dd7 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -44,11 +44,11 @@ static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) } -static void gvir_config_storage_vol_init(GVirConfigStorageVol *conn) +static void gvir_config_storage_vol_init(GVirConfigStorageVol *vol) { - g_debug("Init GVirConfigStorageVol=%p", conn); + g_debug("Init GVirConfigStorageVol=%p", vol); - conn->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(conn); + vol->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(vol); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index b2c49a4..d4e9b97 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -61,8 +61,8 @@ static void gvir_domain_snapshot_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_domain_snapshot_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_domain_snapshot_set_property(GObject *object, static void gvir_domain_snapshot_finalize(GObject *object) { - GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); - GVirDomainSnapshotPrivate *priv = conn->priv; + GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); + GVirDomainSnapshotPrivate *priv = snapshot->priv; - g_debug("Finalize GVirDomainSnapshot=%p", conn); + g_debug("Finalize GVirDomainSnapshot=%p", snapshot); virDomainSnapshotFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) } -static void gvir_domain_snapshot_init(GVirDomainSnapshot *conn) +static void gvir_domain_snapshot_init(GVirDomainSnapshot *snapshot) { - g_debug("Init GVirDomainSnapshot=%p", conn); + g_debug("Init GVirDomainSnapshot=%p", snapshot); - conn->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); + snapshot->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } typedef struct virDomainSnapshot GVirDomainSnapshotHandle; diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index a296144..c6e30e5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -75,8 +75,8 @@ static void gvir_domain_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; switch (prop_id) { case PROP_HANDLE: @@ -84,7 +84,7 @@ static void gvir_domain_get_property(GObject *object, break; case PROP_PERSISTENT: - g_value_set_boolean(value, gvir_domain_get_persistent (conn)); + g_value_set_boolean(value, gvir_domain_get_persistent (domain)); break; default: @@ -98,8 +98,8 @@ static void gvir_domain_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; switch (prop_id) { case PROP_HANDLE: @@ -116,10 +116,10 @@ static void gvir_domain_set_property(GObject *object, static void gvir_domain_finalize(GObject *object) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; - g_debug("Finalize GVirDomain=%p", conn); + g_debug("Finalize GVirDomain=%p", domain); virDomainFree(priv->handle); @@ -129,8 +129,8 @@ static void gvir_domain_finalize(GObject *object) static void gvir_domain_constructed(GObject *object) { - GVirDomain *conn = GVIR_DOMAIN(object); - GVirDomainPrivate *priv = conn->priv; + GVirDomain *domain = GVIR_DOMAIN(object); + GVirDomainPrivate *priv = domain->priv; G_OBJECT_CLASS(gvir_domain_parent_class)->constructed(object); @@ -232,11 +232,11 @@ static void gvir_domain_class_init(GVirDomainClass *klass) } -static void gvir_domain_init(GVirDomain *conn) +static void gvir_domain_init(GVirDomain *domain) { - g_debug("Init GVirDomain=%p", conn); + g_debug("Init GVirDomain=%p", domain); - conn->priv = GVIR_DOMAIN_GET_PRIVATE(conn); + domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); } typedef struct virDomain GVirDomainHandle; diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index aaf81b9..1fc6656 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -61,8 +61,8 @@ static void gvir_interface_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_interface_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_interface_set_property(GObject *object, static void gvir_interface_finalize(GObject *object) { - GVirInterface *conn = GVIR_INTERFACE(object); - GVirInterfacePrivate *priv = conn->priv; + GVirInterface *iface = GVIR_INTERFACE(object); + GVirInterfacePrivate *priv = iface->priv; - g_debug("Finalize GVirInterface=%p", conn); + g_debug("Finalize GVirInterface=%p", iface); virInterfaceFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) } -static void gvir_interface_init(GVirInterface *conn) +static void gvir_interface_init(GVirInterface *iface) { - g_debug("Init GVirInterface=%p", conn); + g_debug("Init GVirInterface=%p", iface); - conn->priv = GVIR_INTERFACE_GET_PRIVATE(conn); + iface->priv = GVIR_INTERFACE_GET_PRIVATE(iface); } typedef struct virInterface GVirInterfaceHandle; diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 005b793..e20343e 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -108,13 +108,13 @@ static void gvir_manager_class_init(GVirManagerClass *klass) } -static void gvir_manager_init(GVirManager *conn) +static void gvir_manager_init(GVirManager *manager) { GVirManagerPrivate *priv; - g_debug("Init GVirManager=%p", conn); + g_debug("Init GVirManager=%p", manager); - priv = conn->priv = GVIR_MANAGER_GET_PRIVATE(conn); + priv = manager->priv = GVIR_MANAGER_GET_PRIVATE(manager); priv->lock = g_mutex_new(); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index c1ba6ac..60756c0 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -148,11 +148,11 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) } -static void gvir_network_filter_init(GVirNetworkFilter *conn) +static void gvir_network_filter_init(GVirNetworkFilter *filter) { - g_debug("Init GVirNetworkFilter=%p", conn); + g_debug("Init GVirNetworkFilter=%p", filter); - conn->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(conn); + filter->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(filter); } typedef struct virNWFilter GVirNetworkFilterHandle; diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 25d89af..b1b38a0 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -62,8 +62,8 @@ static void gvir_network_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; switch (prop_id) { case PROP_HANDLE: @@ -81,8 +81,8 @@ static void gvir_network_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; switch (prop_id) { case PROP_HANDLE: @@ -99,10 +99,10 @@ static void gvir_network_set_property(GObject *object, static void gvir_network_finalize(GObject *object) { - GVirNetwork *conn = GVIR_NETWORK(object); - GVirNetworkPrivate *priv = conn->priv; + GVirNetwork *network = GVIR_NETWORK(object); + GVirNetworkPrivate *priv = network->priv; - g_debug("Finalize GVirNetwork=%p", conn); + g_debug("Finalize GVirNetwork=%p", network); virNetworkFree(priv->handle); @@ -145,11 +145,11 @@ static void gvir_network_class_init(GVirNetworkClass *klass) } -static void gvir_network_init(GVirNetwork *conn) +static void gvir_network_init(GVirNetwork *network) { - g_debug("Init GVirNetwork=%p", conn); + g_debug("Init GVirNetwork=%p", network); - conn->priv = GVIR_NETWORK_GET_PRIVATE(conn); + network->priv = GVIR_NETWORK_GET_PRIVATE(network); } typedef struct virNetwork GVirNetworkHandle; diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 2540795..18394d1 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -61,8 +61,8 @@ static void gvir_node_device_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; switch (prop_id) { case PROP_HANDLE: @@ -80,8 +80,8 @@ static void gvir_node_device_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; switch (prop_id) { case PROP_HANDLE: @@ -98,10 +98,10 @@ static void gvir_node_device_set_property(GObject *object, static void gvir_node_device_finalize(GObject *object) { - GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); - GVirNodeDevicePrivate *priv = conn->priv; + GVirNodeDevice *device = GVIR_NODE_DEVICE(object); + GVirNodeDevicePrivate *priv = device->priv; - g_debug("Finalize GVirNodeDevice=%p", conn); + g_debug("Finalize GVirNodeDevice=%p", device); virNodeDeviceFree(priv->handle); @@ -132,11 +132,11 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) } -static void gvir_node_device_init(GVirNodeDevice *conn) +static void gvir_node_device_init(GVirNodeDevice *device) { - g_debug("Init GVirNodeDevice=%p", conn); + g_debug("Init GVirNodeDevice=%p", device); - conn->priv = GVIR_NODE_DEVICE_GET_PRIVATE(conn); + device->priv = GVIR_NODE_DEVICE_GET_PRIVATE(device); } typedef struct virNodeDevice GVirNodeDeviceHandle; diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 8ff17b5..f03b44c 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -62,8 +62,8 @@ static void gvir_secret_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; switch (prop_id) { case PROP_HANDLE: @@ -81,8 +81,8 @@ static void gvir_secret_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; switch (prop_id) { case PROP_HANDLE: @@ -99,10 +99,10 @@ static void gvir_secret_set_property(GObject *object, static void gvir_secret_finalize(GObject *object) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; - g_debug("Finalize GVirSecret=%p", conn); + g_debug("Finalize GVirSecret=%p", secret); virSecretFree(priv->handle); @@ -112,8 +112,8 @@ static void gvir_secret_finalize(GObject *object) static void gvir_secret_constructed(GObject *object) { - GVirSecret *conn = GVIR_SECRET(object); - GVirSecretPrivate *priv = conn->priv; + GVirSecret *secret = GVIR_SECRET(object); + GVirSecretPrivate *priv = secret->priv; G_OBJECT_CLASS(gvir_secret_parent_class)->constructed(object); @@ -147,11 +147,11 @@ static void gvir_secret_class_init(GVirSecretClass *klass) } -static void gvir_secret_init(GVirSecret *conn) +static void gvir_secret_init(GVirSecret *secret) { - g_debug("Init GVirSecret=%p", conn); + g_debug("Init GVirSecret=%p", secret); - conn->priv = GVIR_SECRET_GET_PRIVATE(conn); + secret->priv = GVIR_SECRET_GET_PRIVATE(secret); } typedef struct virSecret GVirSecretHandle; diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 282eee1..e02adc8 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -123,8 +123,8 @@ static void gvir_storage_pool_finalize(GObject *object) static void gvir_storage_pool_constructed(GObject *object) { - GVirStoragePool *conn = GVIR_STORAGE_POOL(object); - GVirStoragePoolPrivate *priv = conn->priv; + GVirStoragePool *pool = GVIR_STORAGE_POOL(object); + GVirStoragePoolPrivate *priv = pool->priv; G_OBJECT_CLASS(gvir_storage_pool_parent_class)->constructed(object); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 7e5ac7d..4c0160a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -65,8 +65,8 @@ static void gvir_storage_vol_get_property(GObject *object, GValue *value, GParamSpec *pspec) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; switch (prop_id) { case PROP_HANDLE: @@ -88,8 +88,8 @@ static void gvir_storage_vol_set_property(GObject *object, const GValue *value, GParamSpec *pspec) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; switch (prop_id) { case PROP_HANDLE: @@ -109,10 +109,10 @@ static void gvir_storage_vol_set_property(GObject *object, static void gvir_storage_vol_finalize(GObject *object) { - GVirStorageVol *conn = GVIR_STORAGE_VOL(object); - GVirStorageVolPrivate *priv = conn->priv; + GVirStorageVol *vol = GVIR_STORAGE_VOL(object); + GVirStorageVolPrivate *priv = vol->priv; - g_debug("Finalize GVirStorageVol=%p", conn); + g_debug("Finalize GVirStorageVol=%p", vol); virStorageVolFree(priv->handle); @@ -154,11 +154,11 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) } -static void gvir_storage_vol_init(GVirStorageVol *conn) +static void gvir_storage_vol_init(GVirStorageVol *vol) { - g_debug("Init GVirStorageVol=%p", conn); + g_debug("Init GVirStorageVol=%p", vol); - conn->priv = GVIR_STORAGE_VOL_GET_PRIVATE(conn); + vol->priv = GVIR_STORAGE_VOL_GET_PRIVATE(vol); } typedef struct virStorageVol GVirStorageVolHandle; -- 1.8.1.4