Updated information about YAZ.

[yaz-moved-to-github.git] / odr / odr.c

diff --git a/odr/odr.c b/odr/odr.c
index 785a04b..520673d 100644 (file)
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.28  1998-07-20 12:38:13  adam
+ * Revision 1.31  1999-11-30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.30  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.29  1999/04/27 08:34:10  adam
+ * Modified odr_destroy so that file is not closed when file is 0.
+ *
+ * Revision 1.28  1998/07/20 12:38:13  adam
  * More LOG_DEBUG-diagnostics.
  *
  * Revision 1.27  1998/02/11 11:53:34  adam
@@ -101,8 +110,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <xmalloc.h>
-#include <odr.h>
+#include <yaz/xmalloc.h>
+#include <yaz/odr.h>
 
 Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
 
@@ -147,7 +156,7 @@ void odr_setprint(ODR o, FILE *file)
     o->print = file;
 }
 
-#include <log.h>
+#include <yaz/log.h>
 
 ODR odr_createmem(int direction)
 {
@@ -166,7 +175,7 @@ ODR odr_createmem(int direction)
     r->enable_bias = 1;
     r->odr_ber_tag.lclass = -1;
     odr_reset(r);
-    logf (LOG_DEBUG, "odr_createmem dir=%d o=%p", direction, r);
+    yaz_log (LOG_DEBUG, "odr_createmem dir=%d o=%p", direction, r);
     return r;
 }
 
@@ -184,7 +193,7 @@ void odr_reset(ODR o)
     nmem_reset(o->mem);
     o->choice_bias = -1;
     o->lenlen = 1;
-    logf (LOG_DEBUG, "odr_reset o=%p", o);
+    yaz_log (LOG_DEBUG, "odr_reset o=%p", o);
 }
     
 void odr_destroy(ODR o)
@@ -192,10 +201,10 @@ void odr_destroy(ODR o)
     nmem_destroy(o->mem);
     if (o->ecb.buf && o->ecb.can_grow)
        xfree(o->ecb.buf);
-    if (o->print != stderr)
+    if (o->print && o->print != stderr)
         fclose(o->print);
     xfree(o);
-    logf (LOG_DEBUG, "odr_destroy o=%p", o);
+    yaz_log (LOG_DEBUG, "odr_destroy o=%p", o);
 }
 
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)