projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #203, rank-1 crashed with isam-c
[idzebra-moved-to-github.git]
/
bfile
/
mfile.c
diff --git
a/bfile/mfile.c
b/bfile/mfile.c
index
52b64cf
..
3993e34
100644
(file)
--- a/
bfile/mfile.c
+++ b/
bfile/mfile.c
@@
-1,4
+1,4
@@
-/* $Id: mfile.c,v 1.52 2003-04-05 12:32:34 adam Exp $
+/* $Id: mfile.c,v 1.55 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
@@
-132,9
+132,10
@@
static int scan_areadef(MFile_area ma, const char *ad, const char *base)
return 0;
}
return 0;
}
-static int file_position(MFile mf, int pos, int offset)
+static zint file_position(MFile mf, zint pos, int offset)
{
{
- int off = 0, c = mf->cur_file, ps;
+ zint off = 0, ps;
+ int c = mf->cur_file;
if ((c > 0 && pos <= mf->files[c-1].top) ||
(c < mf->no_files -1 && pos > mf->files[c].top))
if ((c > 0 && pos <= mf->files[c-1].top) ||
(c < mf->no_files -1 && pos > mf->files[c].top))
@@
-167,7
+168,7
@@
static int file_position(MFile mf, int pos, int offset)
SEEK_SET) < 0)
{
logf (LOG_WARN|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
SEEK_SET) < 0)
{
logf (LOG_WARN|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
- logf(LOG_WARN, "pos=%d off=%d blocksize=%d offset=%d",
+ logf(LOG_WARN, "pos=" ZINT_FORMAT " off=" ZINT_FORMAT " blocksize=%d offset=%d",
pos, off, mf->blocksize, offset);
return -1;
}
pos, off, mf->blocksize, offset);
return -1;
}
@@
-177,7
+178,12
@@
static int file_position(MFile mf, int pos, int offset)
static int cmp_part_file(const void *p1, const void *p2)
{
static int cmp_part_file(const void *p1, const void *p2)
{
- return ((part_file *)p1)->number - ((part_file *)p2)->number;
+ zint d = ((part_file *)p1)->number - ((part_file *)p2)->number;
+ if (d > 0)
+ return 1;
+ if (d < 0)
+ return -1;
+ return 0;
}
/*
}
/*
@@
-451,9
+457,10
@@
int mf_close(MFile mf)
/*
* Read one block from a metafile. Interface mirrors bfile.
*/
/*
* Read one block from a metafile. Interface mirrors bfile.
*/
-int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
+int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf)
{
{
- int rd, toread;
+ zint rd;
+ int toread;
zebra_mutex_lock (&mf->mutex);
if ((rd = file_position(mf, no, offset)) < 0)
zebra_mutex_lock (&mf->mutex);
if ((rd = file_position(mf, no, offset)) < 0)
@@
-486,9
+493,11
@@
int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
/*
* Write.
*/
/*
* Write.
*/
-int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
+int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf)
{
{
- int ps, nblocks, towrite;
+ zint ps;
+ zint nblocks;
+ int towrite;
mf_dir *dp;
char tmp[FILENAME_MAX+1];
unsigned char dummych = '\xff';
mf_dir *dp;
char tmp[FILENAME_MAX+1];
unsigned char dummych = '\xff';
@@
-512,7
+521,7
@@
int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes /
mf->blocksize)) > 0)
{
if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes /
mf->blocksize)) > 0)
{
- logf (LOG_DEBUG, "Capping off file %s at pos %d",
+ logf (LOG_DEBUG, "Capping off file %s at pos " ZINT_FORMAT,
mf->files[mf->cur_file].path, nblocks);
if ((ps = file_position(mf,
(mf->cur_file ? mf->files[mf->cur_file-1].top : 0) +
mf->files[mf->cur_file].path, nblocks);
if ((ps = file_position(mf,
(mf->cur_file ? mf->files[mf->cur_file-1].top : 0) +
@@
-522,7
+531,7
@@
int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
mf->name);
exit(1);
}
mf->name);
exit(1);
}
- logf (LOG_DEBUG, "ps = %d", ps);
+ logf (LOG_DEBUG, "ps = " ZINT_FORMAT, ps);
if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
{
logf (LOG_ERRNO|LOG_FATAL, "mf_write %s internal error (3)",
if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
{
logf (LOG_ERRNO|LOG_FATAL, "mf_write %s internal error (3)",
@@
-554,7
+563,7
@@
int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
mf->files[mf->cur_file].blocks = 0;
mf->files[mf->cur_file].bytes = 0;
mf->files[mf->cur_file].fd = -1;
mf->files[mf->cur_file].blocks = 0;
mf->files[mf->cur_file].bytes = 0;
mf->files[mf->cur_file].fd = -1;
- sprintf(tmp, "%s/%s-%d.mf", dp->name, mf->name,
+ sprintf(tmp, "%s/%s-" ZINT_FORMAT ".mf", dp->name, mf->name,
mf->files[mf->cur_file].number);
mf->files[mf->cur_file].path = xstrdup(tmp);
mf->no_files++;
mf->files[mf->cur_file].number);
mf->files[mf->cur_file].path = xstrdup(tmp);
mf->no_files++;