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 aba4f3b..07d0647 100644 (file)
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,54 +1,54 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_bit.c,v $
- * 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.
  * Returns 1 on success, 0 on error.
  */
-int odr_bitstring(ODR o, Odr_bitmask **p, int opt)
+int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
 {
     int res, cons = 0;
 
+    if (o->error)
+       return 0;
     if (o->t_class < 0)
     {
        o->t_class = ODR_UNIVERSAL;
        o->t_tag = ODR_BITSTRING;
     }
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
        return 0;
     if (!res)
-    {
-       *p = 0;
-       return opt;
-    }
+       return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
-       fprintf(o->print, "BITSTRING(len=%d)\n", (*p)->top + 1);
+       odr_prname(o, name);
+       fprintf(o->print, "BITSTRING(len=%d)\n",(*p)->top + 1);
        return 1;
     }
     if (o->direction == ODR_DECODE)
     {
-       *p = nalloc(o, sizeof(Odr_bitmask));
+       *p = (Odr_bitmask *)odr_malloc(o, sizeof(Odr_bitmask));
        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
 }