Starting to optimize

[idzebra-moved-to-github.git] / bfile / mfile.c

diff --git a/bfile/mfile.c b/bfile/mfile.c
index a9dc9f6..6b7be96 100644 (file)
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.30  1999-02-02 14:50:02  adam
+ * Revision 1.34  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.33  1999/05/12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.32  1999/04/28 14:53:07  adam
+ * Fixed stupid bug regarding split-files.
+ *
+ * Revision 1.31  1999/02/18 12:49:33  adam
+ * Changed file naming scheme for register files as well as record
+ * store/index files.
+ *
+ * Revision 1.30  1999/02/02 14:50:02  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.29  1998/05/27 14:28:34  adam
@@ -190,7 +203,7 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
                return -1;
        }
         ad++;
-       *dp = dir = xmalloc(sizeof(mf_dir));
+       *dp = dir = (mf_dir *) xmalloc(sizeof(mf_dir));
        dir->next = 0;
        strcpy(dir->name, dirname);
        dir->max_bytes = dir->avail_bytes = fact * size * multi;
@@ -245,7 +258,7 @@ static int cmp_part_file(const void *p1, const void *p2)
  */
 MFile_area mf_init(const char *name, const char *spec)
 {
-    MFile_area ma = xmalloc(sizeof(*ma));
+    MFile_area ma = (MFile_area) xmalloc(sizeof(*ma));
     mf_dir *dirp;
     meta_file *meta_f;
     part_file *part_f = 0;
@@ -276,7 +289,7 @@ MFile_area mf_init(const char *name, const char *spec)
        {
            if (*dent->d_name == '.')
                continue;
-           if (sscanf(dent->d_name, "%[^.].mf.%d", metaname, &number) != 2)
+           if (sscanf(dent->d_name, "%[^-]-%d.mf", metaname, &number) != 2)
            {
                logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
                continue;
@@ -293,7 +306,7 @@ MFile_area mf_init(const char *name, const char *spec)
            /* new metafile */
            if (!meta_f)
            {
-               meta_f = xmalloc(sizeof(*meta_f));
+               meta_f = (meta_file *) xmalloc(sizeof(*meta_f));
                meta_f->ma = ma;
                meta_f->next = ma->mfiles;
                meta_f->open = 0;
@@ -373,7 +386,7 @@ void mf_destroy(MFile_area ma)
  */
 MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
 {
-    struct meta_file *mnew;
+    meta_file *mnew;
     int i;
     char tmp[FILENAME_MAX+1];
     mf_dir *dp;
@@ -383,13 +396,15 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     assert (ma);
     for (mnew = ma->mfiles; mnew; mnew = mnew->next)
        if (!strcmp(name, mnew->name))
+       {
            if (mnew->open)
                abort();
            else
                break;
+       }
     if (!mnew)
     {
-       mnew = xmalloc(sizeof(*mnew));
+       mnew = (meta_file *) xmalloc(sizeof(*mnew));
        strcpy(mnew->name, name);
        /* allocate one, empty file */
        mnew->no_files = 1;
@@ -406,7 +421,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
            return 0;
        }
        mnew->files[0].dir = dp;
-       sprintf(tmp, "%s/%s.mf.%d", dp->name, mnew->name, 0);
+       sprintf(tmp, "%s/%s-%d.mf", dp->name, mnew->name, 0);
        mnew->files[0].path = xstrdup(tmp);
        mnew->ma = ma;
        mnew->next = ma->mfiles;
@@ -464,16 +479,18 @@ int mf_close(MFile mf)
 /*
  * Read one block from a metafile. Interface mirrors bfile.
  */
-int mf_read(MFile mf, int no, int offset, int num, void *buf)
+int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
 {
     int rd, toread;
 
     if ((rd = file_position(mf, no, offset)) < 0)
+    {
         if (rd == -2)
             return 0;
         else
             exit(1);
-    toread = num ? num : mf->blocksize;
+    }
+    toread = nbytes ? nbytes : mf->blocksize;
     if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
     {
        logf (LOG_FATAL|LOG_ERRNO, "mf_read: Read failed (%s)",
@@ -489,7 +506,7 @@ int mf_read(MFile mf, int no, int offset, int num, void *buf)
 /*
  * Write.
  */
-int mf_write(MFile mf, int no, int offset, int num, const void *buf)
+int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 {
     int ps, nblocks, towrite;
     mf_dir *dp;
@@ -547,7 +564,7 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
            mf->files[mf->cur_file].blocks =
                mf->files[mf->cur_file].bytes = 0;
            mf->files[mf->cur_file].fd = -1;
-           sprintf(tmp, "%s/%s.mf.%d", dp->name, mf->name,
+           sprintf(tmp, "%s/%s-%d.mf", dp->name, mf->name,
                mf->files[mf->cur_file].number);
            mf->files[mf->cur_file].path = xstrdup(tmp);
            mf->no_files++;
@@ -565,7 +582,7 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
                nblocks * mf->blocksize;
        }
     }
-    towrite = num ? num : mf->blocksize;
+    towrite = nbytes ? nbytes : mf->blocksize;
     if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
     {
        logf (LOG_FATAL|LOG_ERRNO, "Write failed for file %s part %d",