X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=dict%2Fdcompact.c;h=6b329f1793ae5f215ff65238f46dc3d2c218687d;hb=refs%2Ftags%2FZEBRA.1.3.48;hp=d7725011b5aea24cf471fe087d9634a8aef3e31c;hpb=0cf7b6ddb4409d22dab3e10306826e127fb72f9e;p=idzebra-moved-to-github.git

diff --git a/dict/dcompact.c b/dict/dcompact.c
index d772501..6b329f1 100644
--- a/dict/dcompact.c
+++ b/dict/dcompact.c
@@ -1,4 +1,4 @@
-/* $Id: dcompact.c,v 1.8.2.1 2006-08-14 10:38:54 adam Exp $
+/* $Id: dcompact.c,v 1.8.2.2 2006-12-05 21:14:40 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -20,13 +20,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
+#include <yaz/xmalloc.h>
 #include <yaz/log.h>
 #include <dict.h>
 
@@ -110,7 +109,7 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
 	void *buf;
 	int size;
 #if 0
-	logf (LOG_LOG, "map[%d] = %d", i, map[i]);
+	yaz_log(YLOG_LOG, "map[%d] = %d", i, map[i]);
 #endif
 	dict_bf_readp (dict_from->dbf, i, &buf);
 	size = ((DICT_size(buf)+sizeof(short)-1)/sizeof(short) +
@@ -119,8 +118,8 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
 	no_dir += DICT_nodir(buf);
     }
 #if 0
-    logf (LOG_LOG, "map[%d] = %d", i, map[i]);
-    logf (LOG_LOG, "nodir = %d", no_dir);
+    yaz_log(YLOG_LOG, "map[%d] = %d", i, map[i]);
+    yaz_log(YLOG_LOG, "nodir = %d", no_dir);
 #endif
     dict_to->head.root = map[1];
     dict_to->head.last = map[i];
@@ -129,7 +128,7 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
 	void *old_p, *new_p;
 	dict_bf_readp (dict_from->dbf, i, &old_p);
 
-	logf (LOG_LOG, "dict_bf_newp no=%d size=%d", map[i],
+	yaz_log(YLOG_LOG, "dict_bf_newp no=%d size=%d", map[i],
 	      map[i+1] - map[i]);
         dict_bf_newp (dict_to->dbf, map[i], &new_p, map[i+1] - map[i]);