X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=8e7d85de67da6eebe1f1056100a5db007f3b7b2a;hb=5381b2f81bb793e364cd5b2a910e026ce84d9d05;hp=eb43bfefb6b94fc1d13674a99061ba7941aae6a8;hpb=19af2bd8dfd21731cc978beccd1346133d614c67;p=yaz-moved-to-github.git

diff --git a/odr/odr_null.c b/odr/odr_null.c
index eb43bfe..8e7d85d 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,56 +1,15 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_null.c,v $
- * Revision 1.13  2000-02-29 13:44:55  adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.12  1999/11/30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.11  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.10  1997/11/24 11:33:56  adam
- * Using function odr_nullval() instead of global ODR_NULLVAL when
- * appropriate.
- *
- * Revision 1.9  1995/10/18 16:12:56  quinn
- * Better diagnostics. Added special case in NULL to handle WAIS server.
- *
- * Revision 1.8  1995/09/29  17:12:24  quinn
- * Smallish
- *
- * Revision 1.7  1995/09/27  15:02:59  quinn
- * Modified function heads & prototypes.
- *
- * 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
- * Added better error checking.
- *
- * Revision 1.3  1995/02/10  18:57:25  quinn
- * More in the way of error-checking.
- *
- * Revision 1.2  1995/02/09  15:51:49  quinn
- * Works better now.
- *
- * Revision 1.1  1995/02/02  16:21:54  quinn
- * First kick.
- *
+ * $Id: odr_null.c,v 1.17 2003-05-20 19:55:30 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <yaz/odr.h>
+#include "odr-priv.h"
 
 /*
  * Top level null en/decoder.
@@ -67,10 +26,10 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_NULL;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
     	return 0;
     if (!res)
-    	return opt;
+    	return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
 	odr_prname(o, name);
@@ -80,7 +39,7 @@ int odr_null(ODR o, Odr_null **p, int opt, const char *name)
     if (cons)
     {
 #ifdef ODR_STRICT_NULL
-    	o->error = OPROTO;
+        odr_seterror(OPROTO, 42);
     	return 0;
 #else
 	fprintf(stderr, "odr: Warning: Bad NULL\n");