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
Added forward functions to rsbool, and a few tests for them.
[idzebra-moved-to-github.git]
/
isamc
/
merge.c
diff --git
a/isamc/merge.c
b/isamc/merge.c
index
0900684
..
7bfdf05
100644
(file)
--- a/
isamc/merge.c
+++ b/
isamc/merge.c
@@
-1,4
+1,4
@@
-/* $Id: merge.c,v 1.21 2002-08-02 19:26:56 adam Exp $
+/* $Id: merge.c,v 1.23 2003-06-23 15:36:11 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
@@
-35,6
+35,7
@@
struct isc_merge_block {
int dirty; /* block is different from that on file */
};
int dirty; /* block is different from that on file */
};
+#if 0
static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
int last)
{
static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
int last)
{
@@
-62,6
+63,7
@@
static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
if (!last)
mb[i].dirty = 1;
}
if (!last)
mb[i].dirty = 1;
}
+#endif
static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
char *r_buf, int *firstpos, int cat, int last,
static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
char *r_buf, int *firstpos, int cat, int last,
@@
-152,7
+154,7
@@
static int get_border (ISAMC is, struct isc_merge_block *mb, int ptr,
return mb[ptr].offset + fill - off;
}
return mb[ptr].offset + fill - off;
}
-ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
+ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
{
char i_item[128], *i_item_ptr;
{
char i_item[128], *i_item_ptr;
@@
-480,7
+482,13
@@
ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
/*
* $Log: merge.c,v $
/*
* $Log: merge.c,v $
- * Revision 1.21 2002-08-02 19:26:56 adam
+ * Revision 1.23 2003-06-23 15:36:11 adam
+ * Implemented isamb_unlink.
+ *
+ * Revision 1.22 2003/03/05 16:41:10 adam
+ * Fix GCC warnings
+ *
+ * Revision 1.21 2002/08/02 19:26:56 adam
* Towards GPL
*
* Revision 1.20 1999/11/30 13:48:04 adam
* Towards GPL
*
* Revision 1.20 1999/11/30 13:48:04 adam