shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-14 04:59:00 +03:00
Code Issues Projects Releases Wiki Activity

core: Only depend on GLib 2.30

Browse Source
This commit is contained in:
Colin Walters 2012-04-02 13:42:09 -04:00
parent 047602c56f
commit b971ce0dfa
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libostree/ostree-core.c
View File

@ -680,8 +680,7 @@ ostree_checksum_to_bytes (const char *sha256)
result[i] = (big << 4) | little;
}
return g_variant_new_fixed_array (G_VARIANT_TYPE ("y"),
(guchar*)result, 32, 1);
return ot_gvariant_new_bytearray ((guchar*)result, 32);
}
char *

2
src/libostree/ostree-repo.c
View File

@ -1780,7 +1780,7 @@ create_index_bloom (OstreeRepo *self,
/* TODO - define and compute bloom filter */
ret_bloom = g_variant_new_fixed_array (G_VARIANT_TYPE ("y"), NULL, 0, 1);
ret_bloom = ot_gvariant_new_bytearray (NULL, 0);
g_variant_ref_sink (ret_bloom);
ret = TRUE;

13
src/libotutil/ot-variant-utils.c
View File

@ -28,6 +28,19 @@
#include "otutil.h"
GVariant *
ot_gvariant_new_bytearray (const guchar *data,
gsize len)
{
gpointer data_copy;
GVariant *ret;
data_copy = g_memdup (data, len);
ret = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data_copy,
len, FALSE, g_free, data_copy);
return ret;
}
GHashTable *
ot_util_variant_asv_to_hash_table (GVariant *variant)
{

3
src/libotutil/ot-variant-utils.h
View File

@ -45,6 +45,9 @@ G_BEGIN_DECLS
*a_v = NULL; \
} while (0);
GVariant *ot_gvariant_new_bytearray (const guchar *data,
gsize len);
GHashTable *ot_util_variant_asv_to_hash_table (GVariant *variant);
GVariant * ot_util_variant_take_ref (GVariant *variant);

4
src/ostree/ot-builtin-pack.c
View File

@ -415,9 +415,7 @@ create_pack_file (OtRepackData *data,
packed_object = g_variant_new ("(uy@ay@ay)", GUINT32_TO_BE ((guint32)objtype),
entry_flags,
ostree_checksum_to_bytes (checksum),
g_variant_new_fixed_array (G_VARIANT_TYPE ("y"),
data, data_len,
1));
ot_gvariant_new_bytearray (data, data_len));
g_clear_object (&object_data_stream);
}