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
Fixed bug in odr_reset
[yaz-moved-to-github.git]
/
odr
/
odr_oid.c
diff --git
a/odr/odr_oid.c
b/odr/odr_oid.c
index
44d88ca
..
641e117
100644
(file)
--- a/
odr/odr_oid.c
+++ b/
odr/odr_oid.c
@@
-4,7
+4,16
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oid.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_oid.c,v $
- * Revision 1.3 1995-02-09 15:51:49 quinn
+ * Revision 1.6 1995-03-01 08:40:56 quinn
+ * Smallish changes.
+ *
+ * Revision 1.5 1995/02/10 18:57:26 quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.4 1995/02/10 15:55:29 quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.3 1995/02/09 15:51:49 quinn
* Works better now.
*
* Revision 1.2 1995/02/07 14:13:46 quinn
* Works better now.
*
* Revision 1.2 1995/02/07 14:13:46 quinn
@@
-31,24
+40,21
@@
int odr_oid(ODR o, Odr_oid **p, int opt)
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OID;
}
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OID;
}
- if (o->direction == ODR_DECODE)
- *p =0;
- if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
- {
- *p = 0;
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
return 0;
return 0;
- }
if (!res || cons)
if (!res || cons)
- {
- *p = 0;
return opt;
return opt;
- }
if (o->direction == ODR_PRINT)
{
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%sOID\n", odr_indent(o));
+ int i;
+
+ fprintf(o->print, "%sOID:", odr_indent(o));
+ for (i = 0; (*p)[i] > -1; i++)
+ fprintf(o->print, " %d", (*p)[i]);
+ fprintf(o->print, "\n");
return 1;
}
if (o->direction == ODR_DECODE)
return 1;
}
if (o->direction == ODR_DECODE)
- *p = nalloc(o, ODR_OID_SIZE);
- return ber_oid(o, *p);
+ *p = nalloc(o, ODR_OID_SIZE * sizeof(**p));
+ return ber_oidc(o, *p);
}
}