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
Update with Zebra 1.4 buildconf.sh
[idzebra-moved-to-github.git]
/
bfile
/
cfile.c
diff --git
a/bfile/cfile.c
b/bfile/cfile.c
index
9241385
..
550da60
100644
(file)
--- a/
bfile/cfile.c
+++ b/
bfile/cfile.c
@@
-1,4
+1,4
@@
-/* $Id: cfile.c,v 1.27 2002-08-02 19:26:55 adam Exp $
+/* $Id: cfile.c,v 1.28 2004-08-04 08:35:22 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-328,7
+328,8
@@
static void cf_moveto_flat (CFile cf)
int i, j;
logf (LOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
int i, j;
logf (LOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
- logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=%d total=%d",
+ logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT " total="
+ ZINT_FORMAT,
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
assert (cf->head.state == 1);
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
assert (cf->head.state == 1);
@@
-447,7
+448,7
@@
int cf_new (CFile cf, int no)
}
}
-int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
+int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf)
{
int block;
{
int block;
@@
-461,13
+462,13
@@
int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_read no=" ZINT_FORMAT ", block=%d", no, block);
exit (1);
}
return 1;
}
exit (1);
}
return 1;
}
-int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
+int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf)
{
int block;
{
int block;
@@
-488,7
+489,7
@@
int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_write no=" ZINT_FORMAT ", block=%d", no, block);
exit (1);
}
return 0;
exit (1);
}
return 0;
@@
-496,7
+497,8
@@
int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
int cf_close (CFile cf)
{
int cf_close (CFile cf)
{
- logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=%d total=%d",
+ logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT
+ " total=" ZINT_FORMAT,
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
flush_bucket (cf, -1);
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
flush_bucket (cf, -1);