projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Init diagnostics
[yaz-moved-to-github.git]
/
odr
/
odr_bit.c
diff --git
a/odr/odr_bit.c
b/odr/odr_bit.c
index
aa10414
..
07d0647
100644
(file)
--- a/
odr/odr_bit.c
+++ b/
odr/odr_bit.c
@@
-1,9
+1,9
@@
/*
/*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: odr_bit.c,v 1.15 2002-07-25 12:51:08 adam Exp $
+ * $Id: odr_bit.c,v 1.18 2003-05-20 19:55:30 adam Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
*/
#if HAVE_CONFIG_H
#include <config.h>
@@
-27,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;
}
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 0;
if (!res)
- return opt;
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
odr_prname(o, name);
if (o->direction == ODR_PRINT)
{
odr_prname(o, name);
@@
-43,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;
}
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);
return ber_bitstring(o, *p, cons);
+#endif
}
}