Better ODR diagnostics for missing elements which includes additional

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

diff --git a/odr/odr_int.c b/odr/odr_int.c
index 334609a..a685761 100644 (file)
--- a/odr/odr_int.c
+++ b/odr/odr_int.c
@@ -1,55 +1,15 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_int.c,v $
- * Revision 1.14  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.13  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.12  1999/01/08 11:23:28  adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.11  1998/02/11 11:53:34  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.10  1995/09/29 17:12:24  quinn
- * Smallish
- *
- * Revision 1.9  1995/09/29  17:01:50  quinn
- * More Windows work
- *
- * Revision 1.8  1995/09/27  15:02:59  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.7  1995/05/16  08:50:54  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.6  1995/03/17  10:17:51  quinn
- * Added memory management.
- *
- * Revision 1.5  1995/03/08  12:12:25  quinn
- * Added better error checking.
- *
- * Revision 1.4  1995/02/10  18:57:25  quinn
- * More in the way of error-checking.
- *
- * Revision 1.3  1995/02/09  15:51:48  quinn
- * Works better now.
- *
- * Revision 1.2  1995/02/07  14:13:45  quinn
- * Bug fixes.
- *
- * Revision 1.1  1995/02/02  16:21:53  quinn
- * First kick.
- *
+ * $Id: odr_int.c,v 1.19 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 integer en/decoder.
@@ -66,10 +26,10 @@ int odr_integer(ODR o, int **p, int opt, const char *name)
         o->t_class = ODR_UNIVERSAL;
         o->t_tag = ODR_INTEGER;
     }
-    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);
@@ -78,7 +38,7 @@ int odr_integer(ODR o, int **p, int opt, const char *name)
     }
     if (cons)
     {
-        o->error = OPROTO;
+        odr_seterror(o, OPROTO, 1);
         return 0;
     }
     if (o->direction == ODR_DECODE)