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
Change order of compilation to reflect Unix AM.
[yaz-moved-to-github.git]
/
odr
/
odr_oid.c
diff --git
a/odr/odr_oid.c
b/odr/odr_oid.c
index
780cbdd
..
4077f36
100644
(file)
--- a/
odr/odr_oid.c
+++ b/
odr/odr_oid.c
@@
-1,49
+1,53
@@
/*
/*
- * 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_oid.c,v $
- * 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.20 2003-05-20 19:55:30 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.
*/
/*
* 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;
{
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 (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)
- {
- *p = 0;
+ if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
return 0;
return 0;
- }
- if (!res || cons)
+ if (!res)
+ return odr_missing(o, opt, name);
+ if (cons)
{
{
- *p = 0;
- return opt;
+ odr_seterror(o, OPROTO, 46);
+ return 0;
}
if (o->direction == ODR_PRINT)
{
}
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "OID\n");
+ int i;
+
+ 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)
return 1;
}
if (o->direction == ODR_DECODE)
- *p = nalloc(o, ODR_OID_SIZE);
- return ber_oid(o, *p);
+ *p = (int *)odr_malloc(o, OID_SIZE * sizeof(**p));
+ return ber_oidc(o, *p);
}
}