ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-18 02:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Rhizome manifest setter functions

Browse Source 
Remove interactions between rhizome_manifest_set_filesize()
and rhizome_manifest_set_filehash(), since any inconsistency
is caught by rhizome_manifest_validate() in any case
This commit is contained in:
Andrew Bettison 2013-12-30 16:03:02 +10:30
parent aa3497df4f
commit 42e6168998
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rhizome_bundle.c
View File

@ -149,8 +149,6 @@ void _rhizome_manifest_set_filesize(struct __sourceloc __whence, rhizome_manifes
assert(v); // TODO: remove known manifest fields from vars[]
m->filesize = size;
m->finalised = 0;
if (m->filesize == 0)
rhizome_manifest_set_filehash(m, NULL);
}
/* Must always set file size before setting the file hash, to avoid assertion failures.
@ -159,13 +157,11 @@ void _rhizome_manifest_set_filehash(struct __sourceloc __whence, rhizome_manifes
{
assert(m->filesize != RHIZOME_SIZE_UNSET);
if (hash) {
assert(m->filesize > 0);
const char *v = rhizome_manifest_set(m, "filehash", alloca_tohex_rhizome_filehash_t(*hash));
assert(v); // TODO: remove known manifest fields from vars[]
m->filehash = *hash;
m->has_filehash = 1;
} else {
assert(m->filesize == 0);
rhizome_manifest_del(m, "filehash");
m->filehash = RHIZOME_FILEHASH_NONE;
m->has_filehash = 0;