X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr.c;h=a2e443c0385e3f605260f784f1bf84ab6a2424f1;hp=301f15144604aa24fd3e388649e6f0aa70637e59;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=63aea810bb0d282daf5468eca9f5aa6a5611fc2e

diff --git a/odr/odr.c b/odr/odr.c
index 301f151..a2e443c 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,43 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.21  1996-07-26 13:38:19  quinn
+ * 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
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.25  1997/10/31 12:20:08  adam
+ * Improved memory debugging for xmalloc/nmem.c. References to NMEM
+ * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
+ * Bug fix: missing fclose in data1_read_espec1.
+ *
+ * Revision 1.24  1997/09/01 08:51:07  adam
+ * New windows NT/95 port using MSV5.0. Had to avoid a few static
+ * variables used in function ber_tag. These are now part of the
+ * ODR structure.
+ *
+ * Revision 1.23  1997/04/30 08:52:10  quinn
+ * Null
+ *
+ * Revision 1.22  1996/10/08  12:58:17  adam
+ * New ODR function, odr_choice_enable_bias, to control behaviour of
+ * odr_choice_bias.
+ *
+ * Revision 1.21  1996/07/26  13:38:19  quinn
  * Various smaller things. Gathered header-files.
  *
  * Revision 1.20  1995/11/08  17:41:32  quinn
@@ -79,6 +112,11 @@
 
 Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
 
+Odr_null *odr_nullval (void)
+{
+    return ODR_NULLVAL;
+}
+
 char *odr_errlist[] =
 {
     "No (unknown) error",
@@ -115,11 +153,13 @@ void odr_setprint(ODR o, FILE *file)
     o->print = file;
 }
 
+#include <log.h>
+
 ODR odr_createmem(int direction)
 {
-    struct odr *r;
+    ODR r;
 
-    if (!(r = xmalloc(sizeof(*r))))
+    if (!(r = (ODR)xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
     r->print = stderr;
@@ -129,7 +169,10 @@ ODR odr_createmem(int direction)
     r->ecb.can_grow = 1;
     r->buflen = 0;
     r->mem = nmem_create();
+    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;
 }
 
@@ -147,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)
@@ -154,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);
+    xfree(o);
+    yaz_log (LOG_DEBUG, "odr_destroy o=%p", o);
 }
 
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)