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 functions to return const known OIDs
[yaz-moved-to-github.git]
/
src
/
odr_seq.c
diff --git
a/src/odr_seq.c
b/src/odr_seq.c
index
3e2a03b
..
b9413e7
100644
(file)
--- a/
src/odr_seq.c
+++ b/
src/odr_seq.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: odr_seq.c,v 1.4 2005-06-25 15:46:04 adam Exp $
+ * $Id: odr_seq.c,v 1.7 2007-03-19 21:08:13 adam Exp $
*/
/**
* \file odr_seq.c
*/
/**
* \file odr_seq.c
@@
-20,14
+20,14
@@
int odr_sequence_begin(ODR o, void *p, int size, const char *name)
if (o->error)
return 0;
if (o->error)
return 0;
- if (o->t_class < 0)
+ if (o->op->t_class < 0)
{
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_SEQUENCE;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_SEQUENCE;
}
if (o->direction == ODR_DECODE)
*pp = 0;
}
if (o->direction == ODR_DECODE)
*pp = 0;
- if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
+ if (odr_constructed_begin(o, p, o->op->t_class, o->op->t_tag, name))
{
if (o->direction == ODR_DECODE && size)
*pp = (char *)odr_malloc(o, size);
{
if (o->direction == ODR_DECODE && size)
*pp = (char *)odr_malloc(o, size);
@@
-43,14
+43,14
@@
int odr_set_begin(ODR o, void *p, int size, const char *name)
if (o->error)
return 0;
if (o->error)
return 0;
- if (o->t_class < 0)
+ if (o->op->t_class < 0)
{
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_SET;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_SET;
}
if (o->direction == ODR_DECODE)
*pp = 0;
}
if (o->direction == ODR_DECODE)
*pp = 0;
- if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
+ if (odr_constructed_begin(o, p, o->op->t_class, o->op->t_tag, name))
{
if (o->direction == ODR_DECODE && size)
*pp = (char *)odr_malloc(o, size);
{
if (o->direction == ODR_DECODE && size)
*pp = (char *)odr_malloc(o, size);
@@
-110,14
+110,8
@@
static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num)
}
break;
case ODR_ENCODE: case ODR_PRINT:
}
break;
case ODR_ENCODE: case ODR_PRINT:
-#ifdef ODR_DEBUG
- fprintf(stderr, "[seqof: num=%d]", *num);
-#endif
for (i = 0; i < *num; i++)
{
for (i = 0; i < *num; i++)
{
-#ifdef ODR_DEBUG
- fprintf(stderr, "[seqof: elem #%d]", i);
-#endif
if (!(*type)(o, *pp + i, 0, 0))
return 0;
}
if (!(*type)(o, *pp + i, 0, 0))
return 0;
}