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
Abort when trying to translate a node of unknown type. This happens
[yaz-moved-to-github.git]
/
src
/
odr_null.c
diff --git
a/src/odr_null.c
b/src/odr_null.c
index
ef2eb08
..
877f8be
100644
(file)
--- a/
src/odr_null.c
+++ b/
src/odr_null.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: odr_null.c,v 1.4 2004-10-15 00:19:00 adam Exp $
+ * $Id: odr_null.c,v 1.6 2005-06-25 15:46:04 adam Exp $
*/
/**
* \file odr_null.c
*/
/**
* \file odr_null.c
@@
-23,32
+23,40
@@
int odr_null(ODR o, Odr_null **p, int opt, const char *name)
int res, cons = 0;
if (o->error)
int res, cons = 0;
if (o->error)
- return 0;
+ return 0;
if (o->t_class < 0)
{
if (o->t_class < 0)
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_NULL;
+ o->t_class = ODR_UNIVERSAL;
+ o->t_tag = ODR_NULL;
}
if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
}
if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
- return 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);
- odr_printf(o, "NULL\n");
- return 1;
+ odr_prname(o, name);
+ odr_printf(o, "NULL\n");
+ return 1;
}
if (cons)
{
#ifdef ODR_STRICT_NULL
odr_seterror(OPROTO, 42);
}
if (cons)
{
#ifdef ODR_STRICT_NULL
odr_seterror(OPROTO, 42);
- return 0;
+ return 0;
#else
#else
- /* Warning: Bad NULL */
+ /* Warning: Bad NULL */
#endif
}
if (o->direction == ODR_DECODE)
#endif
}
if (o->direction == ODR_DECODE)
- *p = odr_nullval();
+ *p = odr_nullval();
return ber_null(o);
}
return ber_null(o);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+