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
Note incorrect ID-private OID for VAL_ADMINSERVICE
[yaz-moved-to-github.git]
/
odr
/
odr_null.c
diff --git
a/odr/odr_null.c
b/odr/odr_null.c
index
76e3b05
..
8e7d85d
100644
(file)
--- a/
odr/odr_null.c
+++ b/
odr/odr_null.c
@@
-3,7
+3,7
@@
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: odr_null.c,v 1.15 2003-01-06 08:20:27 adam Exp $
+ * $Id: odr_null.c,v 1.17 2003-05-20 19:55:30 adam Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
*/
#if HAVE_CONFIG_H
#include <config.h>
@@
-26,10
+26,10
@@
int odr_null(ODR o, Odr_null **p, int opt, const char *name)
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)) < 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);
@@
-39,7
+39,7
@@
int odr_null(ODR o, Odr_null **p, int opt, const char *name)
if (cons)
{
#ifdef ODR_STRICT_NULL
if (cons)
{
#ifdef ODR_STRICT_NULL
- o->error = OPROTO;
+ odr_seterror(OPROTO, 42);
return 0;
#else
fprintf(stderr, "odr: Warning: Bad NULL\n");
return 0;
#else
fprintf(stderr, "odr: Warning: Bad NULL\n");