From b2936340b0a6b5ca39cfea7a524cca9ade193f51 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Tue, 2 Nov 2010 18:40:50 +0100 Subject: [PATCH] Add version and reserved field to struct manifest --- manifest.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/manifest.c b/manifest.c index f68374109..dc3c7da92 100644 --- a/manifest.c +++ b/manifest.c @@ -87,6 +87,12 @@ struct object { }; struct manifest { + /* Version of decoded file. */ + uint8_t version; + + /* Reserved for future use. */ + uint16_t reserved; + /* Size of hash fields (in bytes). */ uint8_t hash_size; @@ -207,8 +213,6 @@ read_manifest(gzFile f) struct manifest *mf; uint16_t i, j; uint32_t magic; - uint8_t version; - uint16_t dummy; mf = create_empty_manifest(); @@ -218,9 +222,9 @@ read_manifest(gzFile f) free_manifest(mf); return NULL; } - READ_INT(1, version); - if (version != VERSION) { - cc_log("Manifest file has unknown version %u", version); + READ_INT(1, mf->version); + if (mf->version != VERSION) { + cc_log("Manifest file has unknown version %u", mf->version); free_manifest(mf); return NULL; } @@ -233,7 +237,7 @@ read_manifest(gzFile f) return NULL; } - READ_INT(2, dummy); + READ_INT(2, mf->reserved); READ_INT(4, mf->n_files); mf->files = x_calloc(mf->n_files, sizeof(*mf->files)); -- 2.47.3