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
Works better now.
[yaz-moved-to-github.git]
/
odr
/
odr_oct.c
diff --git
a/odr/odr_oct.c
b/odr/odr_oct.c
index
791654a
..
7ff12e1
100644
(file)
--- a/
odr/odr_oct.c
+++ b/
odr/odr_oct.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oct.c,v $
- * Revision 1.3 1995-02-03 17:04:38 quinn
+ * Revision 1.5 1995-02-09 15:51:49 quinn
+ * Works better now.
+ *
+ * Revision 1.4 1995/02/07 14:13:46 quinn
+ * Bug fixes.
+ *
+ * Revision 1.3 1995/02/03 17:04:38 quinn
* *** empty log message ***
*
* Revision 1.2 1995/02/02 20:38:51 quinn
* *** empty log message ***
*
* Revision 1.2 1995/02/02 20:38:51 quinn
@@
-30,8
+36,13
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt)
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
+ 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)) < 0)
+ {
+ *p = 0;
return 0;
return 0;
+ }
if (!res)
{
*p = 0;
if (!res)
{
*p = 0;
@@
-39,17
+50,20
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt)
}
if (o->direction == ODR_PRINT)
{
}
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
+ fprintf(o->print, "%sOCTETSTRING(len=%d)\n", odr_indent(o), (*p)->len);
return 1;
}
return 1;
}
- if (o->direction == ODR_DECODE && !*p)
+ if (o->direction == ODR_DECODE)
{
*p = nalloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
}
{
*p = nalloc(o, sizeof(Odr_oct));
(*p)->size= 0;
(*p)->len = 0;
(*p)->buf = 0;
}
- return ber_octetstring(o, *p, cons);
+ if (ber_octetstring(o, *p, cons))
+ return 1;
+ *p = 0;
+ return 0;
}
/*
}
/*
@@
-65,6
+79,8
@@
int odr_cstring(ODR o, char **p, int opt)
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OCTETSTRING;
}
+ if (o->direction == ODR_DECODE)
+ *p = 0;
if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
return 0;
if (!res)
if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
return 0;
if (!res)
@@
-74,7
+90,7
@@
int odr_cstring(ODR o, char **p, int opt)
}
if (o->direction == ODR_PRINT)
{
}
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "'%s'\n", *p);
+ fprintf(o->print, "%s'%s'\n", odr_indent(o), *p);
return 1;
}
t = nalloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
return 1;
}
t = nalloc(o, sizeof(Odr_oct)); /* wrapper for octstring */