Renamed logf function to yaz_log. Removed VC++ project files.

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

diff --git a/odr/odr.c b/odr/odr.c
index 3208e7a..a2e443c 100644 (file)
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.27  1998-02-11 11:53:34  adam
+ * 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
  * Changed code so that it compiles as C++.
  *
  * Revision 1.26  1997/11/24 11:33:56  adam
@@ -150,8 +159,6 @@ ODR odr_createmem(int direction)
 {
     ODR r;
 
-
-    logf (LOG_DEBUG, "odr_createmem dir=%d", direction);
     if (!(r = (ODR)xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
@@ -165,6 +172,7 @@ ODR odr_createmem(int direction)
     r->enable_bias = 1;
     r->odr_ber_tag.lclass = -1;
     odr_reset(r);
+    yaz_log (LOG_DEBUG, "odr_createmem dir=%d o=%p", direction, r);
     return r;
 }
 
@@ -182,6 +190,7 @@ void odr_reset(ODR o)
     nmem_reset(o->mem);
     o->choice_bias = -1;
     o->lenlen = 1;
+    yaz_log (LOG_DEBUG, "odr_reset o=%p", o);
 }
     
 void odr_destroy(ODR o)
@@ -189,9 +198,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);
+    yaz_log (LOG_DEBUG, "odr_destroy o=%p", o);
 }
 
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)