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
Yet one more OPAC fix
[yaz-moved-to-github.git]
/
odr
/
odr_bool.c
diff --git
a/odr/odr_bool.c
b/odr/odr_bool.c
index
bc21834
..
9ad56a8
100644
(file)
--- a/
odr/odr_bool.c
+++ b/
odr/odr_bool.c
@@
-1,50
+1,45
@@
/*
/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: odr_bool.c,v $
- * Revision 1.2 1995-02-09 15:51:47 quinn
- * Works better now.
- *
- * Revision 1.1 1995/02/02 16:21:53 quinn
- * First kick.
- *
+ * $Id: odr_bool.c,v 1.15 2003-05-20 19:55:30 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdio.h>
-#include <odr.h>
+#include "odr-priv.h"
/*
* Top level boolean en/decoder.
* Returns 1 on success, 0 on error.
*/
/*
* Top level boolean en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_bool(ODR o, int **p, int opt)
+int odr_bool(ODR o, int **p, int opt, const char *name)
{
int res, cons = 0;
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_BOOLEAN;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_BOOLEAN;
}
- if (o->direction == ODR_DECODE)
- *p = 0;
- if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 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)
- {
- *p = 0;
- return opt;
- }
+ return odr_missing(o, opt, name);
if (o->direction == ODR_PRINT)
{
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%s%s\n", odr_indent(o), (**p ? "TRUE" : "FALSE"));
+ odr_prname(o, name);
+ fprintf(o->print, "%s\n", (**p ? "TRUE" : "FALSE"));
return 1;
}
if (cons)
return 0;
if (o->direction == ODR_DECODE)
return 1;
}
if (cons)
return 0;
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(int));
+ *p = (int *)odr_malloc(o, sizeof(int));
return ber_boolean(o, *p);
}
return ber_boolean(o, *p);
}