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
Changed several yaz_log calls which prints off_t value.
[idzebra-moved-to-github.git]
/
index
/
sortidx.c
diff --git
a/index/sortidx.c
b/index/sortidx.c
index
0c4ebfc
..
6cddaf4
100644
(file)
--- a/
index/sortidx.c
+++ b/
index/sortidx.c
@@
-1,5
+1,5
@@
-/* $Id: sortidx.c,v 1.14 2005-08-09 12:30:46 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: sortidx.c,v 1.17 2006-05-18 12:03:05 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-21,14
+21,14
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
*/
-
+#include <assert.h>
#include <string.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <idzebra/bfile.h>
#include <sortidx.h>
#include <string.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <idzebra/bfile.h>
#include <sortidx.h>
-#include <recindex.h>
+#include "recindex.h"
#define SORT_IDX_BLOCKSIZE 64
#define SORT_IDX_BLOCKSIZE 64
@@
-140,7
+140,18
@@
void sortIdx_add (SortIdx si, const char *buf, int len)
void sortIdx_read (SortIdx si, char *buf)
{
void sortIdx_read (SortIdx si, char *buf)
{
- int r = bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf);
+ int r;
+
+ assert(si->current_file);
+ r = bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf);
if (!r)
memset (buf, 0, SORT_IDX_ENTRYSIZE);
}
if (!r)
memset (buf, 0, SORT_IDX_ENTRYSIZE);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+