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
Bump version to 2.0.34.
[idzebra-moved-to-github.git]
/
dict
/
drdwr.c
diff --git
a/dict/drdwr.c
b/dict/drdwr.c
index
dc6499b
..
937b7eb
100644
(file)
--- a/
dict/drdwr.c
+++ b/
dict/drdwr.c
@@
-1,8
+1,5
@@
-/* $Id: drdwr.c,v 1.13 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1995-2008 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-15,16
+12,16
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <sys/types.h>
#include <fcntl.h>
*/
#include <sys/types.h>
#include <fcntl.h>
-#ifndef WIN32
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#include <unistd.h>
#endif
#include <string.h>
@@
-32,7
+29,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
-#include <dict.h>
+#include "dict-p.h"
void dict_pr_lru (Dict_BFile bf)
{
void dict_pr_lru (Dict_BFile bf)
{
@@
-102,7
+99,7
@@
void dict_bf_flush_blocks (Dict_BFile bf, int no_to_flush)
bf_write (bf->bf, effective_block, effective_offset,
p->nbytes, p->data);
#if 0
bf_write (bf->bf, effective_block, effective_offset,
p->nbytes, p->data);
#if 0
- logf (LOG_LOG, "bf_write no=%d offset=%d size=%d",
+ yaz_log (YLOG_LOG, "bf_write no=%d offset=%d size=%d",
effective_block, effective_offset,
p->nbytes);
#endif
effective_block, effective_offset,
p->nbytes);
#endif
@@
-111,14
+108,14
@@
void dict_bf_flush_blocks (Dict_BFile bf, int no_to_flush)
else
{
#if 0
else
{
#if 0
- logf (LOG_LOG, "bf_write1 no=%d offset=%d size=%d",
+ yaz_log (YLOG_LOG, "bf_write1 no=%d offset=%d size=%d",
effective_block, effective_offset,
remain);
#endif
bf_write (bf->bf, effective_block, effective_offset,
remain, p->data);
#if 0
effective_block, effective_offset,
remain);
#endif
bf_write (bf->bf, effective_block, effective_offset,
remain, p->data);
#if 0
- logf (LOG_LOG, "bf_write2 no=%d offset=%d size=%d",
+ yaz_log (YLOG_LOG, "bf_write2 no=%d offset=%d size=%d",
effective_block+1, 0, p->nbytes - remain);
#endif
bf_write (bf->bf, effective_block+1, 0,
effective_block+1, 0, p->nbytes - remain);
#endif
bf_write (bf->bf, effective_block+1, 0,
@@
-252,3
+249,11
@@
int dict_bf_touch (Dict_BFile dbf, int no)
return -1;
}
return -1;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+