X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=91e8fe24517924a087cec0d0eb0c76c4f1546621;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=67006795cc434d9a5833bf4271e4f28c86077148;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 6700679..91e8fe2 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.27  1999-02-02 14:50:01  adam
+ * Revision 1.29  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.28  1999/05/12 13:08:05  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.27  1999/02/02 14:50:01  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.26  1998/02/17 10:32:52  adam
@@ -109,7 +115,7 @@ struct BFiles_struct {
 
 BFiles bfs_create (const char *spec)
 {
-    BFiles bfs = xmalloc (sizeof(*bfs));
+    BFiles bfs = (BFiles) xmalloc (sizeof(*bfs));
     bfs->commit_area = NULL;
     bfs->register_area = mf_init("register", spec);
     bfs->lockDir = NULL;
@@ -152,7 +158,7 @@ void bf_lockDir (BFiles bfs, const char *lockDir)
     if (lockDir == NULL)
         lockDir = "";
     len = strlen(lockDir);
-    bfs->lockDir = xmalloc (len+2);
+    bfs->lockDir = (char *) xmalloc (len+2);
     strcpy (bfs->lockDir, lockDir);
     
     if (len > 0 && bfs->lockDir[len-1] != '/')
@@ -181,7 +187,7 @@ int bf_close (BFile bf)
 
 BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag)
 {
-    BFile tmp = xmalloc(sizeof(BFile_struct));
+    BFile tmp = (BFile) xmalloc(sizeof(BFile_struct));
 
     if (bfs->commit_area)
     {
@@ -219,20 +225,20 @@ BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag)
     return(tmp);
 }
 
-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)
 {
     int r;
 
-    if (bf->cf && (r=cf_read (bf->cf, no, offset, num, buf)) != -1)
+    if (bf->cf && (r=cf_read (bf->cf, no, offset, nbytes, buf)) != -1)
         return r;
-    return mf_read (bf->mf, no, offset, num, buf);
+    return mf_read (bf->mf, no, offset, nbytes, buf);
 }
 
-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)
 {
     if (bf->cf)
-        return cf_write (bf->cf, no, offset, num, buf);
-    return mf_write (bf->mf, no, offset, num, buf);
+        return cf_write (bf->cf, no, offset, nbytes, buf);
+    return mf_write (bf->mf, no, offset, nbytes, buf);
 }
 
 int bf_commitExists (BFiles bfs)