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

lib/deltas: Squash some GCC maybe-uninitialized warnings 

These show up in the RPM build, I didn't yet try to figure out why we're not
reproducing them outside of that.

Closes: #1510
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-03-22 13:11:07 -04:00 committed by Atomic Bot
parent 38cf31f6a7
commit 83b97ec569
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,14 +241,8 @@ finish_part (OstreeStaticDeltaBuilder *builder, GError **error)
g_variant_builder_add_value (&xattr_builder, part_builder->xattrs->pdata[j]); g_variant_builder_add_value (&xattr_builder, part_builder->xattrs->pdata[j]);
{ {
g_autoptr(GBytes) payload_b; g_autoptr(GBytes) payload_b = g_string_free_to_bytes (g_steal_pointer (&part_builder->payload));
g_autoptr(GBytes) operations_b; g_autoptr(GBytes) operations_b = g_string_free_to_bytes (g_steal_pointer (&part_builder->operations));
payload_b = g_string_free_to_bytes (part_builder->payload);
part_builder->payload = NULL;
operations_b = g_string_free_to_bytes (part_builder->operations);
part_builder->operations = NULL;
delta_part_content = g_variant_new ("(a(uuu)aa(ayay)@ay@ay)", delta_part_content = g_variant_new ("(a(uuu)aa(ayay)@ay@ay)",
&mode_builder, &xattr_builder, &mode_builder, &xattr_builder,

10
src/libostree/ostree-repo-static-delta-core.c
View File

@ -38,10 +38,8 @@ _ostree_static_delta_parse_checksum_array (GVariant *array,
guint *out_n_checksums, guint *out_n_checksums,
GError **error) GError **error)
{ {
gsize n = g_variant_n_children (array); const gsize n = g_variant_n_children (array);
guint n_checksums; const guint n_checksums = n / OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN;
n_checksums = n / OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN;
if (G_UNLIKELY(n > (G_MAXUINT32/OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN) || if (G_UNLIKELY(n > (G_MAXUINT32/OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN) ||
(n_checksums * OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN) != n)) (n_checksums * OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN) != n))
@ -166,8 +164,8 @@ _ostree_repo_static_delta_part_have_all_objects (OstreeRepo *repo,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
guint8 *checksums_data; guint8 *checksums_data = NULL;
guint n_checksums; guint n_checksums = 0;
gboolean have_object = TRUE; gboolean have_object = TRUE;
if (!_ostree_static_delta_parse_checksum_array (checksum_array, if (!_ostree_static_delta_parse_checksum_array (checksum_array,