X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fbfile.c;h=72d1b145a87b86bfe162b66762a1d0a483ed843b;hp=0bb409ee462cc9eb04d6dea7b74d3eb748117f6c;hb=3946190aece0417a4ad4e40946dfcb9f1bca4755;hpb=e57a1c65b9630e5b93d254519090bd0875c1d3c9 diff --git a/bfile/bfile.c b/bfile/bfile.c index 0bb409e..72d1b14 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,4 +1,4 @@ -/* $Id: bfile.c,v 1.48 2006-08-14 10:40:05 adam Exp $ +/* $Id: bfile.c,v 1.49 2006-10-09 22:10:00 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -329,8 +329,8 @@ void bf_reset (BFiles bfs) { if (!bfs) return; - mf_reset (bfs->commit_area); - mf_reset (bfs->register_area); + mf_reset(bfs->commit_area, 1); + mf_reset(bfs->register_area, 1); } void bf_commitExec (BFiles bfs) @@ -377,17 +377,8 @@ void bf_commitClean (BFiles bfs, const char *spec) mustDisable = 1; } - if (!(inf = open_cache (bfs, "rb"))) - return ; - while (fscanf (inf, "%s %d", path, &block_size) == 2) - { - mf = mf_open (bfs->register_area, path, block_size, 0); - cf = cf_open (mf, bfs->commit_area, path, block_size, 1, &firstTime); - cf_unlink (cf); - cf_close (cf); - mf_close (mf); - } - fclose (inf); + mf_reset(bfs->commit_area, 1); + unlink_cache (bfs); if (mustDisable) bf_cache (bfs, 0);