packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Compile again on GLib 2.28

Browse Source
This commit is contained in:
Colin Walters committed 2012-05-05 11:45:19 -04:00
1 parent 471c04605e
commit 38dd179017
6 files changed
+30 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libostree/ostree-repo.c
+12 -8
View File
@@ -74,7 +74,11 @@ struct _OstreeRepoPrivate {
GFile *remote_cache_dir;
GFile *config_file;
#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN)
GMutex cache_lock;
#else
GMutex *cache_lock;
#endif
GPtrArray *cached_meta_indexes;
GPtrArray *cached_content_indexes;
GHashTable *cached_pack_index_mappings;
@@ -115,7 +119,7 @@ ostree_repo_finalize (GObject *object)
ot_clear_ptrarray (&priv->cached_content_indexes);
g_hash_table_destroy (priv->cached_pack_index_mappings);
g_hash_table_destroy (priv->cached_pack_data_mappings);
g_mutex_clear (&priv->cache_lock);
ot_mutex_free (priv->cache_lock);
G_OBJECT_CLASS (ostree_repo_parent_class)->finalize (object);
}
@@ -216,7 +220,7 @@ ostree_repo_init (OstreeRepo *self)
{
OstreeRepoPrivate *priv = GET_PRIVATE (self);
g_mutex_init (&priv->cache_lock);
ot_mutex_init (priv->cache_lock);
priv->cached_pack_index_mappings = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify)g_variant_unref);
@@ -1929,7 +1933,7 @@ ostree_repo_list_pack_indexes (OstreeRepo *self,
ot_lptrarray GPtrArray *ret_meta_indexes = NULL;
ot_lptrarray GPtrArray *ret_data_indexes = NULL;
g_mutex_lock (&priv->cache_lock);
ot_mutex_lock (priv->cache_lock);
if (priv->cached_meta_indexes)
{
ret_meta_indexes = g_ptr_array_ref (priv->cached_meta_indexes);
@@ -1960,7 +1964,7 @@ ostree_repo_list_pack_indexes (OstreeRepo *self,
ot_transfer_out_value (out_meta_indexes, &ret_meta_indexes);
ot_transfer_out_value (out_data_indexes, &ret_data_indexes);
out:
g_mutex_unlock (&priv->cache_lock);
ot_mutex_unlock (priv->cache_lock);
return ret;
}
@@ -3404,7 +3408,7 @@ ostree_repo_load_pack_index (OstreeRepo *self,
ot_lvariant GVariant *ret_variant = NULL;
ot_lobj GFile *path = NULL;
g_mutex_lock (&priv->cache_lock);
ot_mutex_lock (priv->cache_lock);
ret_variant = g_hash_table_lookup (priv->cached_pack_index_mappings, pack_checksum);
if (ret_variant)
@@ -3427,7 +3431,7 @@ ostree_repo_load_pack_index (OstreeRepo *self,
ret = TRUE;
ot_transfer_out_value (out_variant, &ret_variant);
out:
g_mutex_unlock (&priv->cache_lock);
ot_mutex_unlock (priv->cache_lock);
return ret;
}
@@ -3454,7 +3458,7 @@ ostree_repo_map_pack_file (OstreeRepo *self,
GMappedFile *map = NULL;
ot_lobj GFile *path = NULL;
g_mutex_lock (&priv->cache_lock);
ot_mutex_lock (priv->cache_lock);
map = g_hash_table_lookup (priv->cached_pack_data_mappings, pack_checksum);
if (map == NULL)
@@ -3478,7 +3482,7 @@ ostree_repo_map_pack_file (OstreeRepo *self,
if (out_len)
*out_len = ret_len;
out:
g_mutex_unlock (&priv->cache_lock);
ot_mutex_unlock (priv->cache_lock);
return ret;
}