Merge pull request #69 from fangfufu/master

Backporting changes from master
This commit is contained in:
Fufu Fang 2021-07-27 09:45:01 +01:00 committed by GitHub
commit 27f348c104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -266,7 +266,9 @@ static int Meta_write(Cache *cf)
fwrite(&cf->content_length, sizeof(off_t), 1, fp); fwrite(&cf->content_length, sizeof(off_t), 1, fp);
fwrite(&cf->blksz, sizeof(int), 1, fp); fwrite(&cf->blksz, sizeof(int), 1, fp);
fwrite(&cf->segbc, sizeof(long), 1, fp); fwrite(&cf->segbc, sizeof(long), 1, fp);
fwrite(cf->seg, sizeof(Seg), cf->segbc, fp); if (cf->content_length){
fwrite(cf->seg, sizeof(Seg), cf->segbc, fp);
}
/* Error checking for fwrite */ /* Error checking for fwrite */
if (ferror(fp)) { if (ferror(fp)) {
@ -807,7 +809,7 @@ Cache *Cache_open(const char *fn)
/* /*
* Internally inconsistent or corrupt metadata * Internally inconsistent or corrupt metadata
*/ */
if ((rtn == EINCONSIST) || (rtn == EZERO) || (rtn == EMEM)) { if ((rtn == EINCONSIST) || (rtn == EMEM)) {
Cache_free(cf); Cache_free(cf);
fprintf(stderr, "Cache_open(): metadata error: %s, %d.\n", fn, rtn); fprintf(stderr, "Cache_open(): metadata error: %s, %d.\n", fn, rtn);
return NULL; return NULL;