/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: odr_oid.c,v $
- * 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
- * Bug fixes.
- *
- * Revision 1.1 1995/02/03 17:04:38 quinn
- * Initial revision
- *
- *
+ * $Id: odr_oid.c,v 1.17 2002-07-25 12:51:08 adam Exp $
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include "odr-priv.h"
+#include <yaz/oid.h>
/*
* Top level oid en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_oid(ODR o, Odr_oid **p, int opt)
+int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
{
int res, cons = 0;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_OID;
}
- 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)) < 0)
return 0;
- if (!res || cons)
+ if (!res)
return opt;
+ if (cons)
+ {
+ o->error = OPROTO;
+ return 0;
+ }
if (o->direction == ODR_PRINT)
{
int i;
- fprintf(o->print, "%sOID:", odr_indent(o));
+ odr_prname(o, name);
+ fprintf(o->print, "OID:");
for (i = 0; (*p)[i] > -1; i++)
fprintf(o->print, " %d", (*p)[i]);
fprintf(o->print, "\n");
return 1;
}
if (o->direction == ODR_DECODE)
- *p = nalloc(o, ODR_OID_SIZE * sizeof(**p));
+ *p = (int *)odr_malloc(o, OID_SIZE * sizeof(**p));
return ber_oidc(o, *p);
}