X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcfile.c;h=542b0966a403b3e43bacd63977cc94dd34fb1722;hb=bceca936710690858ea162e7bc22de819f0e280f;hp=fcbae17abe7ea100e341e39232f42d763707fb41;hpb=925b59699ea916845d25af1b26e7c58d5beeac00;p=idzebra-moved-to-github.git

diff --git a/bfile/cfile.c b/bfile/cfile.c
index fcbae17..542b096 100644
--- a/bfile/cfile.c
+++ b/bfile/cfile.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1995-1998, Index Data ApS
+ * Copyright (C) 1995-1999, Index Data ApS
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: cfile.c,v $
- * Revision 1.22  1998-10-13 20:07:22  adam
+ * Revision 1.24  1999-05-12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.23  1998/10/15 13:09:29  adam
+ * Minor changes.
+ *
+ * Revision 1.22  1998/10/13 20:07:22  adam
  * Changed some log messages.
  *
  * Revision 1.21  1998/08/24 17:29:52  adam
@@ -129,7 +135,7 @@ CFile cf_open (MFile mf, MFile_area area, const char *fname,
 {
     char path[1024];
     int i;
-    CFile cf = xmalloc (sizeof(*cf));
+    CFile cf = (CFile) xmalloc (sizeof(*cf));
     int hash_bytes;
    
     cf->rmf = mf; 
@@ -500,14 +506,14 @@ int cf_new (CFile cf, int no)
 }
 
 
-int cf_read (CFile cf, int no, int offset, int num, void *buf)
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
 {
     int block;
     
     assert (cf);
     if (!(block = cf_lookup (cf, no)))
         return -1;
-    if (!mf_read (cf->block_mf, block, offset, num, buf))
+    if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
     {
         logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
         exit (1);
@@ -515,7 +521,7 @@ int cf_read (CFile cf, int no, int offset, int num, void *buf)
     return 1;
 }
 
-int cf_write (CFile cf, int no, int offset, int num, const void *buf)
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
 {
     int block;
 
@@ -523,16 +529,16 @@ int cf_write (CFile cf, int no, int offset, int num, const void *buf)
     if (!(block = cf_lookup (cf, no)))
     {
         block = cf_new (cf, no);
-        if (offset || num)
+        if (offset || nbytes)
         {
             mf_read (cf->rmf, no, 0, 0, cf->iobuf);
-            memcpy (cf->iobuf + offset, buf, num);
+            memcpy (cf->iobuf + offset, buf, nbytes);
             buf = cf->iobuf;
             offset = 0;
-            num = 0;
+            nbytes = 0;
         }
     }
-    if (mf_write (cf->block_mf, block, offset, num, buf))
+    if (mf_write (cf->block_mf, block, offset, nbytes, buf))
     {
         logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
         exit (1);