From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 22 May 1995 11:32:01 +0000 (+0000)
Subject: Fixing Interface to odr_null.
X-Git-Tag: YAZ.1.8~1028
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=327f8d22cfd0b717efd69bb105ffee1d05f08e4e

Fixing Interface to odr_null.
---

diff --git a/odr/ber_null.c b/odr/ber_null.c
index 7473ba7..09c0f54 100644
--- a/odr/ber_null.c
+++ b/odr/ber_null.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_null.c,v $
- * Revision 1.5  1995-05-16 08:50:46  quinn
+ * Revision 1.6  1995-05-22 11:32:01  quinn
+ * Fixing Interface to odr_null.
+ *
+ * Revision 1.5  1995/05/16  08:50:46  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.4  1995/04/18  08:15:16  quinn
@@ -27,7 +30,7 @@
 /*
  * BER-en/decoder for NULL type.
  */
-int ber_null(ODR o, int *val)
+int ber_null(ODR o)
 {
     switch (o->direction)
     {
diff --git a/odr/odr.c b/odr/odr.c
index 5c21f2f..d4424c0 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.12  1995-05-16 08:50:49  quinn
+ * Revision 1.13  1995-05-22 11:32:02  quinn
+ * Fixing Interface to odr_null.
+ *
+ * Revision 1.12  1995/05/16  08:50:49  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.11  1995/05/15  11:56:08  quinn
@@ -50,6 +53,8 @@
 #include <dmalloc.h>
 #include <odr.h>
 
+Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
+
 char *odr_errlist[] =
 {
     "No (unknown) error",
diff --git a/odr/odr_null.c b/odr/odr_null.c
index 35279c7..b4fbf64 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.5  1995-05-16 08:50:56  quinn
+ * Revision 1.6  1995-05-22 11:32:03  quinn
+ * Fixing Interface to odr_null.
+ *
+ * Revision 1.5  1995/05/16  08:50:56  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.4  1995/03/08  12:12:26  quinn
@@ -27,10 +30,9 @@
  * Top level null en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_null(ODR o, int **p, int opt)
+int odr_null(ODR o, Odr_null **p, int opt)
 {
     int res, cons = 0;
-    static int nullval = 0;
 
     if (o->error)
     	return 0;
@@ -54,6 +56,6 @@ int odr_null(ODR o, int **p, int opt)
     	return 0;
     }
     if (o->direction == ODR_DECODE)
-    	*p = &nullval;
-    return ber_null(o, *p);
+    	*p = ODR_NULLVAL;
+    return ber_null(o);
 }