X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcfile.h;h=68ee5525a0ce72df550fcccd55caabc8dd628a70;hb=bceca936710690858ea162e7bc22de819f0e280f;hp=5f2184631cdfd0f62ddd765a304f6e917a3aac81;hpb=75573f447b51a5d666a115fbf445af3d2717be48;p=idzebra-moved-to-github.git

diff --git a/bfile/cfile.h b/bfile/cfile.h
index 5f21846..68ee552 100644
--- a/bfile/cfile.h
+++ b/bfile/cfile.h
@@ -1,39 +1,9 @@
 /*
- * Copyright (C) 1995-1998, Index Data
+ * Copyright (C) 1995-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: cfile.h,v $
- * Revision 1.9  1998-08-07 15:07:15  adam
- * Fixed but in cf_commit_flat.
- *
- * Revision 1.8  1996/04/18 16:02:56  adam
- * Changed logging a bit.
- * Removed warning message when commiting flat shadow files.
- *
- * Revision 1.7  1996/02/07  14:03:48  adam
- * Work on flat indexed shadow files.
- *
- * Revision 1.6  1996/02/07  10:08:45  adam
- * Work on flat shadow (not finished yet).
- *
- * Revision 1.5  1995/12/15  12:36:52  adam
- * Moved hash file information to union.
- * Renamed commit files.
- *
- * Revision 1.4  1995/12/11  09:03:54  adam
- * New function: cf_unlink.
- * New member of commit file head: state (0) deleted, (1) hash file.
- *
- * Revision 1.3  1995/12/01  16:24:29  adam
- * Commit files use separate meta file area.
- *
- * Revision 1.2  1995/12/01  11:37:23  adam
- * Cached/commit files implemented as meta-files.
- *
- * Revision 1.1  1995/11/30  08:33:12  adam
- * Started work on commit facility.
- *
+ * $Id: cfile.h,v 1.11 1999-05-12 13:08:06 adam Exp $
  */
 
 #ifndef CFILE_H
@@ -41,13 +11,15 @@
 
 #define HASH_BUCKET 15
 
+struct CFile_ph_bucket {     /* structure on disc */
+    int no[HASH_BUCKET];     /* block number in original file */
+    int vno[HASH_BUCKET];    /* block number in shadow file */
+    int this_bucket;         /* this bucket number */
+    int next_bucket;         /* next bucket number */
+};
+
 struct CFile_hash_bucket {
-    struct CFile_ph_bucket {     /* structure on disc */
-        int no[HASH_BUCKET];     /* block number in original file */
-        int vno[HASH_BUCKET];    /* block number in shadow file */
-        int this_bucket;         /* this bucket number */
-        int next_bucket;         /* next bucket number */
-    } ph;
+    struct CFile_ph_bucket ph;
     int dirty;
     struct CFile_hash_bucket *h_next, **h_prev;
     struct CFile_hash_bucket *lru_next, *lru_prev;
@@ -85,8 +57,8 @@ typedef struct CFile_struct
 int cf_close (CFile cf);
 CFile cf_open (MFile mf, MFile_area area, const char *fname, int block_size,
                int wflag, int *firstp);
-int cf_read (CFile cf, int no, int offset, int num, void *buf);
-int cf_write (CFile cf, int no, int offset, int num, const void *buf);
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf);
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf);
 void cf_unlink (CFile cf);
 void cf_commit (CFile cf);