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
Bug fix: storeData didn't work with files with multiple records.
[idzebra-moved-to-github.git]
/
isam
/
isam.c
diff --git
a/isam/isam.c
b/isam/isam.c
index
da49155
..
380ccec
100644
(file)
--- a/
isam/isam.c
+++ b/
isam/isam.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isam.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isam.c,v $
- * Revision 1.20 1996-03-19 13:14:57 quinn
+ * Revision 1.22 1996-10-29 13:56:53 adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.21 1996/03/29 14:11:47 quinn
+ * Change to is_merge
+ *
+ * Revision 1.20 1996/03/19 13:14:57 quinn
* Moved an xfree()
*
* Revision 1.19 1996/02/10 12:20:56 quinn
* Moved an xfree()
*
* Revision 1.19 1996/02/10 12:20:56 quinn
@@
-70,7
+76,7
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-#include <alexutil.h>
+#include <zebrautl.h>
#include <bfile.h>
#include <isam.h>
#include <common.h>
#include <bfile.h>
#include <isam.h>
#include <common.h>
@@
-476,9
+482,8
@@
ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data)
continue;
}
/* else check if next key can fit in this position */
continue;
}
/* else check if next key can fit in this position */
- is_m_peek_record(&tab, keybuf);
- res = (*is->cmp)(data + 1, keybuf);
- if (res < 0)
+ if (is_m_peek_record(&tab, keybuf) &&
+ (*is->cmp)(data + 1, keybuf) < 0)
{
logf (LOG_DEBUG, "XXReplacing record.");
is_m_replace_record(&tab, data + 1);
{
logf (LOG_DEBUG, "XXReplacing record.");
is_m_replace_record(&tab, data + 1);