libotutil: Allow no variant in ot_util_variant_builder_from_variant()

For programming convenience in cases where we may or may not have a
GVariant to initialize the builder with.
This commit is contained in:
Matthew Barnes committed 2015-03-02 15:12:06 -05:00
1 parent b05d670031
commit fdda36eb77
2 files changed
+15 -19

No files matched your search

+10 -6
View File
@@ -260,16 +260,20 @@ ot_util_variant_builder_from_variant (GVariant *variant,
const GVariantType *type)
{
GVariantBuilder *builder = NULL;
gint i, n;
builder = g_variant_builder_new (type);
n = g_variant_n_children (variant);
for (i = 0; i < n; i++)
if (variant != NULL)
{
GVariant *child = g_variant_get_child_value (variant, i);
g_variant_builder_add_value (builder, child);
g_variant_unref (child);
gint i, n;
n = g_variant_n_children (variant);
for (i = 0; i < n; i++)
{
GVariant *child = g_variant_get_child_value (variant, i);
g_variant_builder_add_value (builder, child);
g_variant_unref (child);
}
}
return builder;