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

Define an initializer for GVariant{Builder,Dict} 

So we build warning-free on GLib (< 2.50, >= 2.50).  This
is a band aid until we hard-require >= 2.50.

Closes: #547
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-10-25 12:07:16 -04:00 committed by Atomic Bot
parent cde7928496
commit 7f2960db43
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -1255,7 +1255,7 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
guint min_fallback_size; guint min_fallback_size;
guint max_bsdiff_size; guint max_bsdiff_size;
guint max_chunk_size; guint max_chunk_size;
g_auto(GVariantBuilder) metadata_builder = {{0,}}; g_auto(GVariantBuilder) metadata_builder = OT_VARIANT_BUILDER_INITIALIZER;
DeltaOpts delta_opts = DELTAOPT_FLAG_NONE; DeltaOpts delta_opts = DELTAOPT_FLAG_NONE;
guint64 total_compressed_size = 0; guint64 total_compressed_size = 0;
guint64 total_uncompressed_size = 0; guint64 total_uncompressed_size = 0;
@ -1391,8 +1391,8 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
g_autoptr(GVariant) delta_part_content = NULL; g_autoptr(GVariant) delta_part_content = NULL;
g_autoptr(GVariant) delta_part = NULL; g_autoptr(GVariant) delta_part = NULL;
g_autoptr(GVariant) delta_part_header = NULL; g_autoptr(GVariant) delta_part_header = NULL;
g_auto(GVariantBuilder) mode_builder = {{0,}}; g_auto(GVariantBuilder) mode_builder = OT_VARIANT_BUILDER_INITIALIZER;
g_auto(GVariantBuilder) xattr_builder = {{0,}}; g_auto(GVariantBuilder) xattr_builder = OT_VARIANT_BUILDER_INITIALIZER;
guint8 compression_type_char; guint8 compression_type_char;
g_variant_builder_init (&mode_builder, G_VARIANT_TYPE ("a(uuu)")); g_variant_builder_init (&mode_builder, G_VARIANT_TYPE ("a(uuu)"));

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

@ -3164,7 +3164,7 @@ ostree_repo_delete_object (OstreeRepo *self,
if (tombstone_commits) if (tombstone_commits)
{ {
g_auto(GVariantBuilder) builder = {{0,}}; g_auto(GVariantBuilder) builder = OT_VARIANT_BUILDER_INITIALIZER;
g_autoptr(GVariant) variant = NULL; g_autoptr(GVariant) variant = NULL;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
@ -4653,7 +4653,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
g_autoptr(GVariant) summary = NULL; g_autoptr(GVariant) summary = NULL;
GList *ordered_keys = NULL; GList *ordered_keys = NULL;
GList *iter = NULL; GList *iter = NULL;
g_auto(GVariantDict) additional_metadata_builder = {{0,}}; g_auto(GVariantDict) additional_metadata_builder = OT_VARIANT_BUILDER_INITIALIZER;
if (!ostree_repo_list_refs (self, NULL, &refs, cancellable, error)) if (!ostree_repo_list_refs (self, NULL, &refs, cancellable, error))
goto out; goto out;
@ -4686,7 +4686,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
{ {
guint i; guint i;
g_autoptr(GPtrArray) delta_names = NULL; g_autoptr(GPtrArray) delta_names = NULL;
g_auto(GVariantDict) deltas_builder = {{0,}}; g_auto(GVariantDict) deltas_builder = OT_VARIANT_BUILDER_INITIALIZER;
if (!ostree_repo_list_static_delta_names (self, &delta_names, cancellable, error)) if (!ostree_repo_list_static_delta_names (self, &delta_names, cancellable, error))
goto out; goto out;

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

@ -33,8 +33,7 @@
GVariant * GVariant *
ot_gvariant_new_empty_string_dict (void) ot_gvariant_new_empty_string_dict (void)
{ {
g_auto(GVariantBuilder) builder = {{0,}}; g_auto(GVariantBuilder) builder = OT_VARIANT_BUILDER_INITIALIZER;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
return g_variant_builder_end (&builder); return g_variant_builder_end (&builder);
} }

7
src/libotutil/otutil.h
View File

@ -26,6 +26,13 @@
#include <string.h> /* Yeah...let's just do that here. */ #include <string.h> /* Yeah...let's just do that here. */
#include <libglnx.h> #include <libglnx.h>
/* https://bugzilla.gnome.org/show_bug.cgi?id=766370 */
#if !GLIB_CHECK_VERSION(2, 49, 3)
#define OT_VARIANT_BUILDER_INITIALIZER {{0,}}
#else
#define OT_VARIANT_BUILDER_INITIALIZER {{{0,}}}
#endif
#define ot_gobject_refz(o) (o ? g_object_ref (o) : o) #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)
#define ot_transfer_out_value(outp, srcp) G_STMT_START { \ #define ot_transfer_out_value(outp, srcp) G_STMT_START { \