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 support for 64 bit input file support.
[idzebra-moved-to-github.git]
/
index
/
sortidx.c
diff --git
a/index/sortidx.c
b/index/sortidx.c
index
8993d1b
..
5c9d5a3
100644
(file)
--- a/
index/sortidx.c
+++ b/
index/sortidx.c
@@
-4,14
+4,20
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: sortidx.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: sortidx.c,v $
- * Revision 1.2 1998-06-25 09:55:50 adam
+ * Revision 1.4 1999-11-30 13:48:03 adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.3 1999/05/26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.2 1998/06/25 09:55:50 adam
* Minor changes - fixex headers.
*
*/
#include <string.h>
* Minor changes - fixex headers.
*
*/
#include <string.h>
-#include <log.h>
+#include <yaz/log.h>
#include <bfile.h>
#include <sortidx.h>
#include <bfile.h>
#include <sortidx.h>
@@
-39,12
+45,12
@@
struct sortIdx {
SortIdx sortIdx_open (BFiles bfs, int write_flag)
{
SortIdx sortIdx_open (BFiles bfs, int write_flag)
{
- SortIdx si = xmalloc (sizeof(*si));
+ SortIdx si = (SortIdx) xmalloc (sizeof(*si));
si->bfs = bfs;
si->write_flag = write_flag;
si->current_file = NULL;
si->files = NULL;
si->bfs = bfs;
si->write_flag = write_flag;
si->current_file = NULL;
si->files = NULL;
- si->entry_buf = xmalloc (SORT_IDX_ENTRYSIZE);
+ si->entry_buf = (char *) xmalloc (SORT_IDX_ENTRYSIZE);
return si;
}
return si;
}
@@
-75,7
+81,7
@@
int sortIdx_type (SortIdx si, int type)
si->current_file = sf;
return 0;
}
si->current_file = sf;
return 0;
}
- sf = xmalloc (sizeof(*sf));
+ sf = (struct sortFile *) xmalloc (sizeof(*sf));
sf->type = type;
sf->bf = NULL;
sf->next = si->files;
sf->type = type;
sf->bf = NULL;
sf->next = si->files;