Remove unused 'priv' variable from _init methods

In most instance _init() methods, the instance priv member
is initialized, but a local 'priv' variable was also declared and
assigned, but not actually used. Kill this intermediate variable
as this causes Coverity warnings.

33 files changed, 34 insertions, 93 deletions

diff --git a/osinfo/osinfo_datamap.c b/osinfo/osinfo_datamap.c
index 50c9c7c..98ce0a6 100644
--- a/osinfo/osinfo_datamap.c
+++ b/osinfo/osinfo_datamap.c
@@ -76,9 +76,7 @@ osinfo_datamap_class_init (OsinfoDatamapClass *klass)
 static void
 osinfo_datamap_init (OsinfoDatamap *list)
 {
-    OsinfoDatamapPrivate *priv;
-    list->priv = priv = OSINFO_DATAMAP_GET_PRIVATE(list);
-
+    list->priv = OSINFO_DATAMAP_GET_PRIVATE(list);
     list->priv->map = g_hash_table_new_full(g_str_hash,
                                             g_str_equal,
                                             g_free,
diff --git a/osinfo/osinfo_datamaplist.c b/osinfo/osinfo_datamaplist.c
index db25bbe..5d0d7b6 100644
--- a/osinfo/osinfo_datamaplist.c
+++ b/osinfo/osinfo_datamaplist.c
@@ -64,9 +64,7 @@ osinfo_datamaplist_class_init (OsinfoDatamapListClass *klass)
 static void
 osinfo_datamaplist_init (OsinfoDatamapList *list)
 {
-    OsinfoDatamapListPrivate *priv;
-    list->priv = priv = OSINFO_DATAMAPLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_DATAMAPLIST_GET_PRIVATE(list);
 }
 
 /**
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index adf2737..413db8f 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -172,9 +172,7 @@ osinfo_db_class_init (OsinfoDbClass *klass)
 static void
 osinfo_db_init (OsinfoDb *db)
 {
-    OsinfoDbPrivate *priv;
-    db->priv = priv = OSINFO_DB_GET_PRIVATE(db);
-
+    db->priv = OSINFO_DB_GET_PRIVATE(db);
     db->priv->devices = osinfo_devicelist_new();
     db->priv->platforms = osinfo_platformlist_new();
     db->priv->oses = osinfo_oslist_new();
diff --git a/osinfo/osinfo_deployment.c b/osinfo/osinfo_deployment.c
index 3678fa2..3e511e2 100644
--- a/osinfo/osinfo_deployment.c
+++ b/osinfo/osinfo_deployment.c
@@ -182,9 +182,7 @@ osinfo_deployment_class_init (OsinfoDeploymentClass *klass)
 static void
 osinfo_deployment_init (OsinfoDeployment *deployment)
 {
-    OsinfoDeploymentPrivate *priv;
-    deployment->priv = priv = OSINFO_DEPLOYMENT_GET_PRIVATE(deployment);
-
+    deployment->priv = OSINFO_DEPLOYMENT_GET_PRIVATE(deployment);
     deployment->priv->deviceLinks = NULL;
 }
 
diff --git a/osinfo/osinfo_deploymentlist.c b/osinfo/osinfo_deploymentlist.c
index d411cff..41a5575 100644
--- a/osinfo/osinfo_deploymentlist.c
+++ b/osinfo/osinfo_deploymentlist.c
@@ -65,9 +65,7 @@ osinfo_deploymentlist_class_init (OsinfoDeploymentListClass *klass)
 static void
 osinfo_deploymentlist_init (OsinfoDeploymentList *list)
 {
-    OsinfoDeploymentListPrivate *priv;
-    list->priv = priv = OSINFO_DEPLOYMENTLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_DEPLOYMENTLIST_GET_PRIVATE(list);
 }
 
 
diff --git a/osinfo/osinfo_device.c b/osinfo/osinfo_device.c
index d3fb3d7..183ae41 100644
--- a/osinfo/osinfo_device.c
+++ b/osinfo/osinfo_device.c
@@ -70,8 +70,7 @@ osinfo_device_class_init (OsinfoDeviceClass *klass)
 static void
 osinfo_device_init (OsinfoDevice *device)
 {
-    OsinfoDevicePrivate *priv;
-    device->priv = priv = OSINFO_DEVICE_GET_PRIVATE(device);
+    device->priv = OSINFO_DEVICE_GET_PRIVATE(device);
 }
 
 OsinfoDevice *osinfo_device_new(const gchar *id)
diff --git a/osinfo/osinfo_device_driver.c b/osinfo/osinfo_device_driver.c
index d402bc7..23731bf 100644
--- a/osinfo/osinfo_device_driver.c
+++ b/osinfo/osinfo_device_driver.c
@@ -76,10 +76,8 @@ osinfo_device_driver_class_init (OsinfoDeviceDriverClass *klass)
 static void
 osinfo_device_driver_init (OsinfoDeviceDriver *driver)
 {
-    OsinfoDeviceDriverPrivate *priv;
-    driver->priv = priv = OSINFO_DEVICE_DRIVER_GET_PRIVATE(driver);
-
-    priv->devices = osinfo_devicelist_new ();
+    driver->priv = OSINFO_DEVICE_DRIVER_GET_PRIVATE(driver);
+    driver->priv->devices = osinfo_devicelist_new ();
 }
 
 OsinfoDeviceDriver *osinfo_device_driver_new(const gchar *id)
diff --git a/osinfo/osinfo_device_driverlist.c b/osinfo/osinfo_device_driverlist.c
index b4f6f0f..11f29db 100644
--- a/osinfo/osinfo_device_driverlist.c
+++ b/osinfo/osinfo_device_driverlist.c
@@ -66,9 +66,7 @@ osinfo_device_driverlist_class_init (OsinfoDeviceDriverListClass *klass)
 static void
 osinfo_device_driverlist_init (OsinfoDeviceDriverList *list)
 {
-    OsinfoDeviceDriverListPrivate *priv;
-    list->priv = priv = OSINFO_DEVICE_DRIVERLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_DEVICE_DRIVERLIST_GET_PRIVATE(list);
 }
 
 /**
diff --git a/osinfo/osinfo_devicelink.c b/osinfo/osinfo_devicelink.c
index 52dea06..95b5770 100644
--- a/osinfo/osinfo_devicelink.c
+++ b/osinfo/osinfo_devicelink.c
@@ -143,8 +143,7 @@ osinfo_devicelink_class_init (OsinfoDeviceLinkClass *klass)
 static void
 osinfo_devicelink_init (OsinfoDeviceLink *devlink)
 {
-    OsinfoDeviceLinkPrivate *priv;
-    devlink->priv = priv = OSINFO_DEVICELINK_GET_PRIVATE(devlink);
+    devlink->priv = OSINFO_DEVICELINK_GET_PRIVATE(devlink);
 }
 
 
diff --git a/osinfo/osinfo_devicelinkfilter.c b/osinfo/osinfo_devicelinkfilter.c
index 004d38a..6e30823 100644
--- a/osinfo/osinfo_devicelinkfilter.c
+++ b/osinfo/osinfo_devicelinkfilter.c
@@ -166,9 +166,7 @@ OsinfoDeviceLinkFilter *osinfo_devicelinkfilter_new(OsinfoFilter *filter)
 static void
 osinfo_devicelinkfilter_init (OsinfoDeviceLinkFilter *devicelinkfilter)
 {
-    OsinfoDeviceLinkFilterPrivate *priv;
-    priv = OSINFO_DEVICELINKFILTER_GET_PRIVATE(devicelinkfilter);
-    devicelinkfilter->priv = priv;
+    devicelinkfilter->priv = OSINFO_DEVICELINKFILTER_GET_PRIVATE(devicelinkfilter);
 }
 
 
diff --git a/osinfo/osinfo_devicelinklist.c b/osinfo/osinfo_devicelinklist.c
index 89b6ce6..672934f 100644
--- a/osinfo/osinfo_devicelinklist.c
+++ b/osinfo/osinfo_devicelinklist.c
@@ -65,9 +65,7 @@ osinfo_devicelinklist_class_init (OsinfoDeviceLinkListClass *klass)
 static void
 osinfo_devicelinklist_init (OsinfoDeviceLinkList *list)
 {
-    OsinfoDeviceLinkListPrivate *priv;
-    list->priv = priv = OSINFO_DEVICELINKLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_DEVICELINKLIST_GET_PRIVATE(list);
 }
 
 
diff --git a/osinfo/osinfo_devicelist.c b/osinfo/osinfo_devicelist.c
index 96ad2fc..ca2ceef 100644
--- a/osinfo/osinfo_devicelist.c
+++ b/osinfo/osinfo_devicelist.c
@@ -65,9 +65,7 @@ osinfo_devicelist_class_init (OsinfoDeviceListClass *klass)
 static void
 osinfo_devicelist_init (OsinfoDeviceList *list)
 {
-    OsinfoDeviceListPrivate *priv;
-    list->priv = priv = OSINFO_DEVICELIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_DEVICELIST_GET_PRIVATE(list);
 }
 
 
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index b291252..543c710 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -161,9 +161,7 @@ static void osinfo_entity_param_values_free(gpointer values)
 static void
 osinfo_entity_init (OsinfoEntity *entity)
 {
-    OsinfoEntityPrivate *priv;
-    entity->priv = priv = OSINFO_ENTITY_GET_PRIVATE(entity);
-
+    entity->priv = OSINFO_ENTITY_GET_PRIVATE(entity);
     entity->priv->params = g_hash_table_new_full(g_str_hash,
                                                g_str_equal,
                                                g_free,
diff --git a/osinfo/osinfo_filter.c b/osinfo/osinfo_filter.c
index 6f19ec1..959ab6e 100644
--- a/osinfo/osinfo_filter.c
+++ b/osinfo/osinfo_filter.c
@@ -105,9 +105,7 @@ osinfo_filter_prop_constraints_free(gpointer props)
 static void
 osinfo_filter_init (OsinfoFilter *filter)
 {
-    OsinfoFilterPrivate *priv;
-    priv = OSINFO_FILTER_GET_PRIVATE(filter);
-    filter->priv = priv;
+    filter->priv = OSINFO_FILTER_GET_PRIVATE(filter);
 
     filter->priv->propertyConstraints =
         g_hash_table_new_full(g_str_hash,
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 93dc039..1712be5 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -67,11 +67,10 @@ static const gchar valid[] = {
 static void
 osinfo_install_config_init (OsinfoInstallConfig *config)
 {
-    OsinfoInstallConfigPrivate *priv;
     gchar pass[9];
     gsize i;
 
-    config->priv = priv = OSINFO_INSTALL_CONFIG_GET_PRIVATE(config);
+    config->priv = OSINFO_INSTALL_CONFIG_GET_PRIVATE(config);
 
     osinfo_entity_set_param(OSINFO_ENTITY(config),
                             OSINFO_INSTALL_CONFIG_PROP_L10N_KEYBOARD,
diff --git a/osinfo/osinfo_install_config_paramlist.c b/osinfo/osinfo_install_config_paramlist.c
index d3eeffc..740de70 100644
--- a/osinfo/osinfo_install_config_paramlist.c
+++ b/osinfo/osinfo_install_config_paramlist.c
@@ -66,9 +66,7 @@ osinfo_install_config_paramlist_class_init (OsinfoInstallConfigParamListClass *k
 static void
 osinfo_install_config_paramlist_init (OsinfoInstallConfigParamList *list)
 {
-    OsinfoInstallConfigParamListPrivate *priv;
-    list->priv = priv = OSINFO_INSTALL_CONFIG_PARAMLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_INSTALL_CONFIG_PARAMLIST_GET_PRIVATE(list);
 }
 
 /**
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 7105430..276c756 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -337,9 +337,7 @@ osinfo_install_script_get_config_param(const OsinfoInstallScript *script,
 static void
 osinfo_install_script_init (OsinfoInstallScript *list)
 {
-    OsinfoInstallScriptPrivate *priv;
-    list->priv = priv = OSINFO_INSTALL_SCRIPT_GET_PRIVATE(list);
-
+    list->priv = OSINFO_INSTALL_SCRIPT_GET_PRIVATE(list);
     list->priv->config_params = osinfo_install_config_paramlist_new();
 }
 
diff --git a/osinfo/osinfo_install_scriptlist.c b/osinfo/osinfo_install_scriptlist.c
index 99f49dd..9edc4fa 100644
--- a/osinfo/osinfo_install_scriptlist.c
+++ b/osinfo/osinfo_install_scriptlist.c
@@ -65,9 +65,7 @@ osinfo_install_scriptlist_class_init (OsinfoInstallScriptListClass *klass)
 static void
 osinfo_install_scriptlist_init (OsinfoInstallScriptList *list)
 {
-    OsinfoInstallScriptListPrivate *priv;
-    list->priv = priv = OSINFO_INSTALL_SCRIPTLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_INSTALL_SCRIPTLIST_GET_PRIVATE(list);
 }
 
 /**
diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c
index c32a5ff..ddfd58d 100644
--- a/osinfo/osinfo_list.c
+++ b/osinfo/osinfo_list.c
@@ -145,9 +145,7 @@ osinfo_list_class_init (OsinfoListClass *klass)
 static void
 osinfo_list_init (OsinfoList *list)
 {
-    OsinfoListPrivate *priv;
-    list->priv = priv = OSINFO_LIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_LIST_GET_PRIVATE(list);
     list->priv->array = g_ptr_array_new_with_free_func(NULL);
     list->priv->entities = g_hash_table_new_full(g_str_hash,
                                                  g_str_equal,
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index efbbc97..d713767 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -84,9 +84,7 @@ osinfo_loader_class_init (OsinfoLoaderClass *klass)
 static void
 osinfo_loader_init (OsinfoLoader *loader)
 {
-    OsinfoLoaderPrivate *priv;
-    loader->priv = priv = OSINFO_LOADER_GET_PRIVATE(loader);
-
+    loader->priv = OSINFO_LOADER_GET_PRIVATE(loader);
     loader->priv->db = osinfo_db_new();
 }
 
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index 8f03046..67dd6af 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -552,8 +552,7 @@ osinfo_media_class_init (OsinfoMediaClass *klass)
 static void
 osinfo_media_init (OsinfoMedia *media)
 {
-    OsinfoMediaPrivate *priv;
-    media->priv = priv = OSINFO_MEDIA_GET_PRIVATE(media);
+    media->priv = OSINFO_MEDIA_GET_PRIVATE(media);
     g_weak_ref_init(&media->priv->os, NULL);
 }
 
diff --git a/osinfo/osinfo_medialist.c b/osinfo/osinfo_medialist.c
index 3894177..9ec06bf 100644
--- a/osinfo/osinfo_medialist.c
+++ b/osinfo/osinfo_medialist.c
@@ -65,9 +65,7 @@ osinfo_medialist_class_init (OsinfoMediaListClass *klass)
 static void
 osinfo_medialist_init (OsinfoMediaList *list)
 {
-    OsinfoMediaListPrivate *priv;
-    list->priv = priv = OSINFO_MEDIALIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_MEDIALIST_GET_PRIVATE(list);
 }
 
 /**
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index 97c33f7..25f7a4c 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -171,8 +171,7 @@ osinfo_os_class_init (OsinfoOsClass *klass)
 static void
 osinfo_os_init (OsinfoOs *os)
 {
-    OsinfoOsPrivate *priv;
-    os->priv = priv = OSINFO_OS_GET_PRIVATE(os);
+    os->priv = OSINFO_OS_GET_PRIVATE(os);
 
     os->priv->deviceLinks = NULL;
     os->priv->medias = osinfo_medialist_new ();
diff --git a/osinfo/osinfo_oslist.c b/osinfo/osinfo_oslist.c
index fbb2f30..e2f5c42 100644
--- a/osinfo/osinfo_oslist.c
+++ b/osinfo/osinfo_oslist.c
@@ -65,9 +65,7 @@ osinfo_oslist_class_init (OsinfoOsListClass *klass)
 static void
 osinfo_oslist_init (OsinfoOsList *list)
 {
-    OsinfoOsListPrivate *priv;
-    list->priv = priv = OSINFO_OSLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_OSLIST_GET_PRIVATE(list);
 }
 
 
diff --git a/osinfo/osinfo_platform.c b/osinfo/osinfo_platform.c
index 73411aa..fdec4c6 100644
--- a/osinfo/osinfo_platform.c
+++ b/osinfo/osinfo_platform.c
@@ -81,9 +81,7 @@ osinfo_platform_class_init (OsinfoPlatformClass *klass)
 static void
 osinfo_platform_init (OsinfoPlatform *platform)
 {
-    OsinfoPlatformPrivate *priv;
-    platform->priv = priv = OSINFO_PLATFORM_GET_PRIVATE(platform);
-
+    platform->priv = OSINFO_PLATFORM_GET_PRIVATE(platform);
     platform->priv->deviceLinks = NULL;
 }
 
diff --git a/osinfo/osinfo_platformlist.c b/osinfo/osinfo_platformlist.c
index ef197e3..cdd7052 100644
--- a/osinfo/osinfo_platformlist.c
+++ b/osinfo/osinfo_platformlist.c
@@ -65,9 +65,7 @@ osinfo_platformlist_class_init (OsinfoPlatformListClass *klass)
 static void
 osinfo_platformlist_init (OsinfoPlatformList *list)
 {
-    OsinfoPlatformListPrivate *priv;
-    list->priv = priv = OSINFO_PLATFORMLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_PLATFORMLIST_GET_PRIVATE(list);
 }
 
 
diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c
index 8f0a799..47edb9c 100644
--- a/osinfo/osinfo_product.c
+++ b/osinfo/osinfo_product.c
@@ -239,9 +239,7 @@ osinfo_product_class_init (OsinfoProductClass *klass)
 static void
 osinfo_product_init (OsinfoProduct *product)
 {
-    OsinfoProductPrivate *priv;
-    product->priv = priv = OSINFO_PRODUCT_GET_PRIVATE(product);
-
+    product->priv = OSINFO_PRODUCT_GET_PRIVATE(product);
     product->priv->productLinks = NULL;
 }
 
diff --git a/osinfo/osinfo_productfilter.c b/osinfo/osinfo_productfilter.c
index 5961707..075ccc6 100644
--- a/osinfo/osinfo_productfilter.c
+++ b/osinfo/osinfo_productfilter.c
@@ -110,10 +110,7 @@ osinfo_productfilter_product_constraints_free(gpointer relshps)
 static void
 osinfo_productfilter_init (OsinfoProductFilter *productfilter)
 {
-    OsinfoProductFilterPrivate *priv;
-    priv = OSINFO_PRODUCTFILTER_GET_PRIVATE(productfilter);
-    productfilter->priv = priv;
-
+    productfilter->priv = OSINFO_PRODUCTFILTER_GET_PRIVATE(productfilter);
     productfilter->priv->productConstraints =
         g_hash_table_new_full(g_direct_hash,
                               g_direct_equal,
diff --git a/osinfo/osinfo_productlist.c b/osinfo/osinfo_productlist.c
index adbcb3b..5ebcc90 100644
--- a/osinfo/osinfo_productlist.c
+++ b/osinfo/osinfo_productlist.c
@@ -65,9 +65,7 @@ osinfo_productlist_class_init (OsinfoProductListClass *klass)
 static void
 osinfo_productlist_init (OsinfoProductList *list)
 {
-    OsinfoProductListPrivate *priv;
-    list->priv = priv = OSINFO_PRODUCTLIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_PRODUCTLIST_GET_PRIVATE(list);
 }
 
 
diff --git a/osinfo/osinfo_resources.c b/osinfo/osinfo_resources.c
index 67d9952..7dfb3d1 100644
--- a/osinfo/osinfo_resources.c
+++ b/osinfo/osinfo_resources.c
@@ -248,8 +248,7 @@ osinfo_resources_class_init (OsinfoResourcesClass *klass)
 static void
 osinfo_resources_init (OsinfoResources *resources)
 {
-    OsinfoResourcesPrivate *priv;
-    resources->priv = priv = OSINFO_RESOURCES_GET_PRIVATE(resources);
+    resources->priv = OSINFO_RESOURCES_GET_PRIVATE(resources);
 }
 
 OsinfoResources *osinfo_resources_new(const gchar *id,
diff --git a/osinfo/osinfo_resourceslist.c b/osinfo/osinfo_resourceslist.c
index 45c54f6..407ccf9 100644
--- a/osinfo/osinfo_resourceslist.c
+++ b/osinfo/osinfo_resourceslist.c
@@ -67,8 +67,7 @@ osinfo_resourceslist_class_init (OsinfoResourcesListClass *klass)
 static void
 osinfo_resourceslist_init (OsinfoResourcesList *list)
 {
-    OsinfoResourcesListPrivate *priv;
-    list->priv = priv = OSINFO_RESOURCESLIST_GET_PRIVATE(list);
+    list->priv = OSINFO_RESOURCESLIST_GET_PRIVATE(list);
 
 }
 
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index fe8e659..96db760 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -389,8 +389,7 @@ osinfo_tree_class_init(OsinfoTreeClass *klass)
 static void
 osinfo_tree_init(OsinfoTree *tree)
 {
-    OsinfoTreePrivate *priv;
-    tree->priv = priv = OSINFO_TREE_GET_PRIVATE(tree);
+    tree->priv = OSINFO_TREE_GET_PRIVATE(tree);
 }
 
 OsinfoTree *osinfo_tree_new(const gchar *id,
diff --git a/osinfo/osinfo_treelist.c b/osinfo/osinfo_treelist.c
index 9b1e47e..d3508a2 100644
--- a/osinfo/osinfo_treelist.c
+++ b/osinfo/osinfo_treelist.c
@@ -65,9 +65,7 @@ osinfo_treelist_class_init (OsinfoTreeListClass *klass)
 static void
 osinfo_treelist_init (OsinfoTreeList *list)
 {
-    OsinfoTreeListPrivate *priv;
-    list->priv = priv = OSINFO_TREELIST_GET_PRIVATE(list);
-
+    list->priv = OSINFO_TREELIST_GET_PRIVATE(list);
 }
 
 /**