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 structure year and date.
[idzebra-moved-to-github.git]
/
rset
/
rsm_or.c
diff --git
a/rset/rsm_or.c
b/rset/rsm_or.c
index
a0f37a5
..
382e5dd
100644
(file)
--- a/
rset/rsm_or.c
+++ b/
rset/rsm_or.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994-1998, Index Data
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsm_or.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsm_or.c,v $
- * Revision 1.8 1999-05-26 07:49:14 adam
+ * Revision 1.10 1999-11-30 13:48:04 adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.9 1999/07/13 14:45:42 adam
+ * Fixed memory leak.
+ *
+ * Revision 1.8 1999/05/26 07:49:14 adam
* C++ compilation.
*
* Revision 1.7 1998/09/22 10:03:46 adam
* C++ compilation.
*
* Revision 1.7 1998/09/22 10:03:46 adam
@@
-34,15
+40,17
@@
*
*/
*
*/
+
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <zebrautl.h>
+#if ZMBOL
#include <isam.h>
#include <isamc.h>
#include <rsm_or.h>
#include <isam.h>
#include <isamc.h>
#include <rsm_or.h>
-#include <zebrautl.h>
static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
@@
-177,6
+185,7
@@
struct trunc_info *heap_init (int size, int key_size,
static void heap_close (struct trunc_info *ti)
{
static void heap_close (struct trunc_info *ti)
{
+ xfree (ti->buf);
xfree (ti->ptr);
xfree (ti->indx);
xfree (ti->heap);
xfree (ti->ptr);
xfree (ti->indx);
xfree (ti->heap);
@@
-345,3
+354,4
@@
static int r_write (RSFD rfd, const void *buf)
logf (LOG_FATAL, "mor set type is read-only");
return -1;
}
logf (LOG_FATAL, "mor set type is read-only");
return -1;
}
+#endif