X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fbfile.h;h=018a8d6f4cf6c3172c70fee8cff7148cc6849925;hb=a20e59c5087fb92c419f2330c786367f9ce8ccd2;hp=ec86cd9981eecd17e5a2fe84ff3dbd945ecd0640;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git

diff --git a/include/bfile.h b/include/bfile.h
index ec86cd9..018a8d6 100644
--- a/include/bfile.h
+++ b/include/bfile.h
@@ -3,52 +3,7 @@
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: bfile.h,v $
- * Revision 1.16  1999-02-02 14:50:29  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.15  1997/09/17 12:19:07  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.14  1997/09/05 15:29:58  adam
- * Changed prototype for chr_map_input - added const.
- * Added support for C++, headers uses extern "C" for public definitions.
- *
- * Revision 1.13  1996/10/29 13:43:07  adam
- * Added a few comments.
- *
- * Revision 1.12  1996/03/26 16:00:44  adam
- * The directory of the shadow table can be specified by the new
- * bf_lockDir call.
- *
- * Revision 1.11  1995/12/08  16:20:39  adam
- * New commit utilities - used for 'save' update.
- *
- * Revision 1.10  1995/12/01  16:24:33  adam
- * Commit files use separate meta file area.
- *
- * Revision 1.9  1995/12/01  11:37:46  adam
- * Cached/commit files implemented as meta-files.
- *
- * Revision 1.8  1995/11/30  08:33:29  adam
- * Started work on commit facility.
- *
- * Revision 1.7  1995/09/04  12:33:35  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.6  1994/09/14  13:10:35  quinn
- * Small changes
- *
- * Revision 1.5  1994/08/24  08:45:52  quinn
- * Using mfile.
- *
- * Revision 1.4  1994/08/17  15:38:28  adam
- * Include of util.h.
- *
- * Revision 1.3  1994/08/17  14:09:47  quinn
- * Small changes
- *
+ * $Id: bfile.h,v 1.20 2002-04-04 14:14:13 adam Exp $
  */
 
 #ifndef BFILE_H
@@ -64,12 +19,13 @@ extern "C" {
 
 typedef struct BFiles_struct *BFiles;
 
-BFiles bfs_create (const char *spec);
+BFiles bfs_create (const char *spec, const char *base);
 void bfs_destroy (BFiles bfiles);
 
 typedef struct BFile_struct
 {
     MFile mf;
+    Zebra_lock_rdwr rdwr_lock;
     struct CFile_struct *cf;
 } *BFile, BFile_struct;
 
@@ -85,25 +41,22 @@ int bf_close (BFile);
 BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag);
 
 /* bf_read: reads bytes from bfile 'bf'.
-   reads 'num' bytes (or whole block if 0) from offset 'offset' from
+   reads 'nbytes' bytes (or whole block if 0) from offset 'offset' from
    block 'no'. stores contents in buffer 'buf'.
    returns 1 if whole block could be read; 0 otherwise.
  */
-int bf_read (BFile bf, int no, int offset, int num, void *buf);
+int bf_read (BFile bf, int no, int offset, int nbytes, void *buf);
 
 /* bf_write: writes bytes to bfile 'bf'.
-   writes 'num' bytes (or whole block if 0) at offset 'offset' to
+   writes 'nbytes' bytes (or whole block if 0) at offset 'offset' to
    block 'no'. retrieves contents from buffer 'buf'.
    returns 0 if successful; non-zero otherwise.
  */
-int bf_write (BFile bf, int no, int offset, int num, const void *buf);
+int bf_write (BFile bf, int no, int offset, int nbytes, const void *buf);
 
 /* bf_cache: enables bfile cache if spec is not NULL */
 void bf_cache (BFiles bfs, const char *spec);
 
-/* bf_lockDir: specifies locking directory for the cache system */
-void bf_lockDir (BFiles bfs, const char *lockDir);
-
 /* bf_commitExists: returns 1 if commit is pending; 0 otherwise */
 int bf_commitExists (BFiles bfs);
 
@@ -113,6 +66,9 @@ void bf_commitExec (BFiles bfs);
 /* bf_commitClean: cleans commit files, etc */
 void bf_commitClean (BFiles bfs, const char *spec);
 
+/* bf_reset: delete register and shadow completely */
+void bf_reset (BFiles bfs);
+
 #ifdef __cplusplus
 }
 #endif