summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@redhat.com>2015-01-22 17:21:36 +0100
committerTomas Bzatek <tbzatek@redhat.com>2015-01-22 17:21:36 +0100
commit7e2a655363380725ebaaadf5bffe4817ccba6ef2 (patch)
tree6a408b1d082b3530d023a0de323ea837cb0b26a4
parentf377a17a74b95e6ddc76242b25123f2f6f924544 (diff)
udisks-modular: Conform to older GHashTable APImodular
Turned out the return values of g_hash_table_insert() and g_hash_table_replace() are additions to late glib versions.
-rw-r--r--src/udiskslinuxprovider.c6
-rw-r--r--src/udisksmodulemanager.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/udiskslinuxprovider.c b/src/udiskslinuxprovider.c
index 9f78848..4d838c8 100644
--- a/src/udiskslinuxprovider.c
+++ b/src/udiskslinuxprovider.c
@@ -1044,16 +1044,16 @@ handle_block_uevent_for_modules (UDisksLinuxProvider *provider,
g_str_equal,
(GDestroyNotify) g_free,
NULL);
- g_warn_if_fail (g_hash_table_add (inst_sysfs_paths, g_strdup (sysfs_path)));
+ g_hash_table_add (inst_sysfs_paths, g_strdup (sysfs_path));
if (inst_table == NULL)
{
inst_table = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) g_hash_table_unref);
- g_warn_if_fail (g_hash_table_insert (provider->module_funcs_to_instances, module_object_new_func, inst_table));
+ g_hash_table_insert (provider->module_funcs_to_instances, module_object_new_func, inst_table);
}
- g_warn_if_fail (g_hash_table_insert (inst_table, object, inst_sysfs_paths));
+ g_hash_table_insert (inst_table, object, inst_sysfs_paths);
}
}
}
diff --git a/src/udisksmodulemanager.c b/src/udisksmodulemanager.c
index 1c755ef..0475927 100644
--- a/src/udisksmodulemanager.c
+++ b/src/udisksmodulemanager.c
@@ -541,7 +541,7 @@ udisks_module_manager_set_module_state_pointer (UDisksModuleManager *manager,
{
g_return_if_fail (UDISKS_IS_MODULE_MANAGER (manager));
- g_warn_if_fail (g_hash_table_insert (manager->state_pointers, g_strdup (module_name), state));
+ g_hash_table_insert (manager->state_pointers, g_strdup (module_name), state);
}
/**