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

diff --git a/odr/odr.c b/odr/odr.c
index 307283c..b44078a 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.17  1995-09-29 17:01:50  quinn
+ * 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 +68,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 */
@@ -87,26 +93,26 @@ 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)
+ODR odr_createmem(int direction)
 {
     struct odr *r;
 
-    if (!(r = malloc(sizeof(*r))))
+    if (!(r = xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
     r->print = stderr;
@@ -120,7 +126,7 @@ ODR MDF odr_createmem(int direction)
     return r;
 }
 
-void MDF odr_reset(ODR o)
+void odr_reset(ODR o)
 {
     o->error = ONONE;
     o->bp = o->buf;
@@ -136,17 +142,17 @@ void MDF odr_reset(ODR o)
     o->choice_bias = -1;
 }
     
-void MDF odr_destroy(ODR o)
+void odr_destroy(ODR o)
 {
     odr_release_mem(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 +163,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)