From 513d47a90cb076e6e73eb92053ed5d73d6d3dd16 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 28 Jan 2015 17:42:59 -0500 Subject: [PATCH] deltas: Add _V0 to part #define To make more explicitly clear that this is the version that matches the version in the metadata. --- src/libostree/ostree-repo-static-delta-private.h | 4 ++-- src/libostree/ostree-repo-static-delta-processing.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libostree/ostree-repo-static-delta-private.h b/src/libostree/ostree-repo-static-delta-private.h index 6377f533..4c0f8c14 100644 --- a/src/libostree/ostree-repo-static-delta-private.h +++ b/src/libostree/ostree-repo-static-delta-private.h @@ -30,14 +30,14 @@ G_BEGIN_DECLS #define OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN 33 /** - * OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT: + * OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0: * * y compression type (0: none, 'x': lzma) * --- * ay data source * ay operations */ -#define OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT "(ayay)" +#define OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0 "(ayay)" /** * OSTREE_STATIC_DELTA_META_ENTRY_FORMAT: diff --git a/src/libostree/ostree-repo-static-delta-processing.c b/src/libostree/ostree-repo-static-delta-processing.c index 03b37359..e7a445cf 100644 --- a/src/libostree/ostree-repo-static-delta-processing.c +++ b/src/libostree/ostree-repo-static-delta-processing.c @@ -334,7 +334,7 @@ _ostree_static_delta_part_execute (OstreeRepo *repo, goto out; } - payload = ot_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT), + payload = ot_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0), payload_data, FALSE); if (!_ostree_static_delta_part_execute_raw (repo, header, payload, cancellable, error))