Version 3.0.49. Update news.

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

diff --git a/src/odr_bit.c b/src/odr_bit.c
index 5addedc..b7dcd76 100644 (file)
--- a/src/odr_bit.c
+++ b/src/odr_bit.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_bit.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
@@ -27,19 +25,32 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_BITSTRING;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_BITSTRING;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
         return 0;
     if (!res)
         return odr_missing(o, opt, name);
     if (o->direction == ODR_PRINT)
     {
+        int i = ODR_BITMASK_SIZE;
+        int j;
         odr_prname(o, name);
-        odr_printf(o, "BITSTRING(len=%d)\n",(*p)->top + 1);
+        odr_printf(o, "BITSTRING(len=%d) ",(*p)->top + 1);
+        while (--i > 0)
+            if (ODR_MASK_GET(*p, i))
+                break;
+        for (j = 0; j <= i; j++)
+        {
+            odr_printf(o, "%c", ODR_MASK_GET(*p, j) ? '1' : '0');
+            if (j && ((j+1)&7) == 0)
+                odr_printf(o, "-");
+        }
+        odr_printf(o, "\n");
         return 1;
     }
     if (o->direction == ODR_DECODE)
@@ -60,6 +71,7 @@ int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab