summaryrefslogtreecommitdiff
path: root/manifest.c
diff options
context:
space:
mode:
authorJoel Rosdahl <joel@rosdahl.net>2010-11-02 18:40:50 +0100
committerJoel Rosdahl <joel@rosdahl.net>2010-11-02 18:40:50 +0100
commitb2936340b0a6b5ca39cfea7a524cca9ade193f51 (patch)
treec04e1da36e0ba51904a6a0e6553d7aa579cd4ab7 /manifest.c
parentde36c5490a6aa55b1e3542b4844e397fc0cb02e1 (diff)
downloadccache-b2936340b0a6b5ca39cfea7a524cca9ade193f51.tar.gz
Add version and reserved field to struct manifest
Diffstat (limited to 'manifest.c')
-rw-r--r--manifest.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/manifest.c b/manifest.c
index f6837410..dc3c7da9 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));