Better ODR diagnostics for missing elements which includes additional

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

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 1631f88..07d0647 100644 (file)
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,51 +1,16 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bit.c,v $
- * Revision 1.12  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.11  1998/02/11 11:53:34  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.10  1995/09/29 17:12:22  quinn
- * Smallish
- *
- * Revision 1.9  1995/09/27  15:02:58  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.8  1995/05/16  08:50:51  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.7  1995/03/17  10:17:48  quinn
- * Added memory management.
- *
- * Revision 1.6  1995/03/08  12:12:19  quinn
- * Added better error checking.
- *
- * Revision 1.5  1995/02/10  18:57:25  quinn
- * More in the way of error-checking.
- *
- * Revision 1.4  1995/02/09  15:51:47  quinn
- * Works better now.
- *
- * Revision 1.3  1995/02/07  14:13:45  quinn
- * Bug fixes.
- *
- * Revision 1.2  1995/02/03  17:04:37  quinn
- * *** empty log message ***
- *
- * Revision 1.1  1995/02/02  20:38:50  quinn
- * Updates.
- *
- *
+ * $Id: odr_bit.c,v 1.18 2003-05-20 19:55:30 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
 #include <string.h>
+#include "odr-priv.h"
 
 /*
  * Top level bitstring string en/decoder.
@@ -62,10 +27,10 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
        o->t_class = ODR_UNIVERSAL;
        o->t_tag = ODR_BITSTRING;
     }
-    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,5 +43,12 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
        memset((*p)->bits, 0, ODR_BITMASK_SIZE);
        (*p)->top = -1;
     }
+#if 0
+    /* ignoring the cons helps with at least one target. 
+     * http://bugzilla.indexdata.dk/cgi-bin/bugzilla/show_bug.cgi?id=24
+     */
+    return ber_bitstring(o, *p, 0);
+#else
     return ber_bitstring(o, *p, cons);
+#endif
 }