Windows-support changes

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

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index ba38619..d5d2dab 100644 (file)
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.7  1995-03-08 12:12:27  quinn
+ * Revision 1.10  1995-09-27 15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/05/16  08:50:56  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.8  1995/03/17  10:17:54  quinn
+ * Added memory management.
+ *
+ * Revision 1.7  1995/03/08  12:12:27  quinn
  * Added better error checking.
  *
  * Revision 1.6  1995/02/10  18:57:26  quinn
@@ -33,7 +42,7 @@
  * Top level octet string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_octetstring(ODR o, Odr_oct **p, int opt)
+int MDF odr_octetstring(ODR o, Odr_oct **p, int opt)
 {
     int res, cons = 0;
 
@@ -55,7 +64,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt)
     }
     if (o->direction == ODR_DECODE)
     {
-       *p = nalloc(o, sizeof(Odr_oct));
+       *p = odr_malloc(o, sizeof(Odr_oct));
        (*p)->size= 0;
        (*p)->len = 0;
        (*p)->buf = 0;
@@ -69,7 +78,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt)
 /*
  * Friendlier interface to octetstring.
  */
-int odr_cstring(ODR o, char **p, int opt)
+int MDF odr_cstring(ODR o, char **p, int opt)
 {
     int cons = 0, res;
     Odr_oct *t;
@@ -90,7 +99,7 @@ int odr_cstring(ODR o, char **p, int opt)
        fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
        return 1;
     }
-    t = nalloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
+    t = odr_malloc(o, sizeof(Odr_oct));   /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
        t->buf = (unsigned char *) *p;