X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr.c;h=efded18c79047b6951736a557da57a38c146065e;hp=307283cb9e42ef88aea41584bb752280911a9537;hb=068a5a7412f492019b4d6f5e89158098d44368f7;hpb=9c459af695605b44a044ad206562818be10034f1

diff --git a/odr/odr.c b/odr/odr.c
index 307283c..efded18 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,39 @@
 /*
- * 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.17  1995-09-29 17:01:50  quinn
+ * 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
+ * Smallish.
+ *
+ * Revision 1.19  1995/11/01  13:54:41  quinn
+ * Minor adjustments
+ *
+ * Revision 1.18  1995/09/29  17:12:22  quinn
+ * Smallish
+ *
+ * Revision 1.17  1995/09/29  17:01:50  quinn
  * More Windows work
  *
  * Revision 1.16  1995/09/27  15:02:57  quinn
@@ -62,7 +91,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <dmalloc.h>
+#include <xmalloc.h>
 #include <odr.h>
 
 Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
@@ -79,7 +108,8 @@ char *odr_errlist[] =
     "Protocol error",
     "Malformed data",
     "Stack overflow",
-    "Length of constructed type different from sum of members"
+    "Length of constructed type different from sum of members",
+    "Overflow writing definite length of constructed type"
 };
 
 char *odr_errmsg(int n)
@@ -87,26 +117,30 @@ char *odr_errmsg(int n)
     return odr_errlist[n];
 }
 
-void MDF odr_perror(ODR o, char *message)
+void odr_perror(ODR o, char *message)
 {
     fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]);
 }
 
-int MDF odr_geterror(ODR o)
+int odr_geterror(ODR o)
 {
     return o->error;
 }
 
-void MDF odr_setprint(ODR o, FILE *file)
+void odr_setprint(ODR o, FILE *file)
 {
     o->print = file;
 }
 
-ODR MDF odr_createmem(int direction)
+#include <log.h>
+
+ODR odr_createmem(int direction)
 {
     struct odr *r;
 
-    if (!(r = malloc(sizeof(*r))))
+
+    logf (LOG_DEBUG, "odr_createmem dir=%d", direction);
+    if (!(r = xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
     r->print = stderr;
@@ -115,12 +149,14 @@ ODR MDF odr_createmem(int direction)
     r->ecb.size = r->ecb.pos = r->ecb.top = 0;
     r->ecb.can_grow = 1;
     r->buflen = 0;
-    r->mem = 0;
+    r->mem = nmem_create();
+    r->enable_bias = 1;
+    r->odr_ber_tag.lclass = -1;
     odr_reset(r);
     return r;
 }
 
-void MDF odr_reset(ODR o)
+void odr_reset(ODR o)
 {
     o->error = ONONE;
     o->bp = o->buf;
@@ -131,22 +167,22 @@ void MDF odr_reset(ODR o)
     o->t_tag = -1;
     o->indent = 0;
     o->stackp = -1;
-    odr_release_mem(o->mem);
-    o->mem = 0;
+    nmem_reset(o->mem);
     o->choice_bias = -1;
+    o->lenlen = 1;
 }
     
-void MDF odr_destroy(ODR o)
+void odr_destroy(ODR o)
 {
-    odr_release_mem(o->mem);
+    nmem_destroy(o->mem);
     if (o->ecb.buf && o->ecb.can_grow)
-        free(o->ecb.buf);
+       xfree(o->ecb.buf);
     if (o->print != stderr)
         fclose(o->print);
-    free(o);
+    xfree(o);
 }
 
-void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow)
+void odr_setbuf(ODR o, char *buf, int len, int can_grow)
 {
     o->buf = o->bp = (unsigned char *) buf;
     o->buflen = o->left = len;
@@ -157,7 +193,7 @@ void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow)
     o->ecb.size = len;
 }
 
-char MDF *odr_getbuf(ODR o, int *len, int *size)
+char *odr_getbuf(ODR o, int *len, int *size)
 {
     *len = o->ecb.top;
     if (size)