X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=b05fc1d027803fbe7d34bc55a2dcc98fbce9d333;hb=9eaf65aa25be411fbd6298292f5ad7a7df7083ed;hp=a4b5353b798b8178ccdfaf767e7fd160cec7c5e6;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index a4b5353..b05fc1d 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -1,5 +1,5 @@
-/* $Id: bfile.c,v 1.47 2006-05-10 08:13:17 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: bfile.c,v 1.50 2006-10-10 10:19:28 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -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)
@@ -363,13 +363,7 @@ void bf_commitExec (BFiles bfs)
 
 void bf_commitClean (BFiles bfs, const char *spec)
 {
-    FILE *inf;
-    int block_size;
-    char path[256];
-    MFile mf;
-    CFile cf;
     int mustDisable = 0;
-    int firstTime;
 
     if (!bfs->commit_area)
     {
@@ -377,17 +371,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);