X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdrdwr.c;h=edcefc10a16dfd20f1238066e8d593c8fb06fe6c;hp=dc6499b1cb472f8d6adfe7d13e1d2591d6c2588c;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=896c0427df9d8eff5de6a1735dcd992e067df844

diff --git a/dict/drdwr.c b/dict/drdwr.c
index dc6499b..edcefc1 100644
--- a/dict/drdwr.c
+++ b/dict/drdwr.c
@@ -1,6 +1,6 @@
-/* $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
+/* $Id: drdwr.c,v 1.19 2006-08-14 10:40:09 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,16 +15,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
-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>
-#ifndef WIN32
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>
@@ -32,7 +32,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <assert.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
 void dict_pr_lru (Dict_BFile bf)
 {
@@ -102,7 +102,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
-		    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
@@ -111,14 +111,14 @@ void dict_bf_flush_blocks (Dict_BFile bf, int no_to_flush)
 		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
-		    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,
@@ -252,3 +252,11 @@ int dict_bf_touch (Dict_BFile dbf, int no)
     return -1;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+