X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=3208e7a80ec189d0921cd2f148126b8064d8ded7;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=d5b0ce5401f150726eca4928c04e3deb9dd28000;hpb=7436fd1fdf0ca6d2c5c68d9cc0cd57f53d9c8e12;p=yaz-moved-to-github.git

diff --git a/odr/odr.c b/odr/odr.c
index d5b0ce5..3208e7a 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,30 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.22  1996-10-08 12:58:17  adam
+ * 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.
  *
@@ -83,6 +103,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",
@@ -119,11 +144,15 @@ 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))))
+    logf (LOG_DEBUG, "odr_createmem dir=%d", direction);
+    if (!(r = (ODR)xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
     r->print = stderr;
@@ -134,6 +163,7 @@ ODR odr_createmem(int direction)
     r->buflen = 0;
     r->mem = nmem_create();
     r->enable_bias = 1;
+    r->odr_ber_tag.lclass = -1;
     odr_reset(r);
     return r;
 }
@@ -161,7 +191,7 @@ void odr_destroy(ODR o)
        xfree(o->ecb.buf);
     if (o->print != stderr)
         fclose(o->print);
-   xfree(o);
+    xfree(o);
 }
 
 void odr_setbuf(ODR o, char *buf, int len, int can_grow)