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
Added copy of CCL and MARC display
[yaz-moved-to-github.git]
/
odr
/
odr_any.c
diff --git
a/odr/odr_any.c
b/odr/odr_any.c
index
018c8e5
..
cfbff27
100644
(file)
--- a/
odr/odr_any.c
+++ b/
odr/odr_any.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_any.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_any.c,v $
- * Revision 1.1 1995-02-09 15:51:47 quinn
+ * Revision 1.3 1995-03-17 10:17:46 quinn
+ * Added memory management.
+ *
+ * Revision 1.2 1995/03/08 12:12:18 quinn
+ * Added better error checking.
+ *
+ * Revision 1.1 1995/02/09 15:51:47 quinn
* Works better now.
*
*/
* Works better now.
*
*/
@@
-19,17
+25,19
@@
*/
int odr_any(ODR o, Odr_any **p, int opt)
{
*/
int odr_any(ODR o, Odr_any **p, int opt)
{
- if (o->direction == ODR_ENCODE && !*p)
- return opt;
+ if (o->error)
+ return 0;
if (o->direction == ODR_PRINT)
{
fprintf(o->print, "%sANY (len=%d)\n", odr_indent(o), (*p)->len);
return 1;
}
if (o->direction == ODR_DECODE)
if (o->direction == ODR_PRINT)
{
fprintf(o->print, "%sANY (len=%d)\n", odr_indent(o), (*p)->len);
return 1;
}
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
if (ber_any(o, p))
return 1;
*p = 0;
if (ber_any(o, p))
return 1;
*p = 0;
+ if (!opt)
+ o->error = OREQUIRED;
return opt;
}
return opt;
}