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
Fixed bug #2352: yaz-marcdump crashes for certain record.
[yaz-moved-to-github.git]
/
src
/
odr_bit.c
diff --git
a/src/odr_bit.c
b/src/odr_bit.c
index
05ef420
..
599893e
100644
(file)
--- a/
src/odr_bit.c
+++ b/
src/odr_bit.c
@@
-1,10
+1,13
@@
-/*
- * Copyright (c) 1995-2003, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: odr_bit.c,v 1.1 2003-10-27 12:21:33 adam Exp $
*/
*/
+
+/**
+ * \file odr_bit.c
+ * \brief Implements ODR BITSTRING codec
+ */
+
#if HAVE_CONFIG_H
#include <config.h>
#endif
#if HAVE_CONFIG_H
#include <config.h>
#endif
@@
-21,27
+24,28
@@
int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
int res, cons = 0;
if (o->error)
int res, cons = 0;
if (o->error)
- return 0;
- if (o->t_class < 0)
+ return 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)
- return 0;
+ res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+ if (res < 0)
+ return 0;
if (!res)
if (!res)
- return odr_missing(o, opt, name);
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
if (o->direction == ODR_PRINT)
{
- odr_prname(o, name);
- fprintf(o->print, "BITSTRING(len=%d)\n",(*p)->top + 1);
- return 1;
+ odr_prname(o, name);
+ odr_printf(o, "BITSTRING(len=%d)\n",(*p)->top + 1);
+ return 1;
}
if (o->direction == ODR_DECODE)
{
}
if (o->direction == ODR_DECODE)
{
- *p = (Odr_bitmask *)odr_malloc(o, sizeof(Odr_bitmask));
- memset((*p)->bits, 0, ODR_BITMASK_SIZE);
- (*p)->top = -1;
+ *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.
}
#if 0
/* ignoring the cons helps with at least one target.
@@
-52,3
+56,11
@@
int odr_bitstring(ODR o, Odr_bitmask **p, int opt, const char *name)
return ber_bitstring(o, *p, cons);
#endif
}
return ber_bitstring(o, *p, cons);
#endif
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+