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 inclusion of oid_db.h
[yaz-moved-to-github.git]
/
src
/
odr_choice.c
diff --git
a/src/odr_choice.c
b/src/odr_choice.c
index
3020e2d
..
b3744ca
100644
(file)
--- a/
src/odr_choice.c
+++ b/
src/odr_choice.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_choice.c,v 1.5 2005-06-25 15:46:04 adam Exp $
+ * $Id: odr_choice.c,v 1.8 2007-03-19 21:08:13 adam Exp $
*/
/**
*/
/**
@@
-19,7
+19,7
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
const char *name)
{
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
const char *name)
{
- int i, cl = -1, tg, cn, *which = (int *)whichp, bias = o->choice_bias;
+ int i, cl = -1, tg, cn, *which = (int *)whichp, bias = o->op->choice_bias;
if (o->error)
return 0;
if (o->error)
return 0;
@@
-31,7
+31,7
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
*which = -1;
*(char**)p = 0;
}
*which = -1;
*(char**)p = 0;
}
- o->choice_bias = -1;
+ o->op->choice_bias = -1;
if (o->direction == ODR_PRINT)
{
if (o->direction == ODR_PRINT)
{
@@
-56,7
+56,7
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
{
if (o->direction == ODR_DECODE && cl < 0)
{
{
if (o->direction == ODR_DECODE && cl < 0)
{
- if (o->op->stackp > -1 && !odr_constructed_more(o))
+ if (o->op->stack_top && !odr_constructed_more(o))
return 0;
if (ber_dectag(o->bp, &cl, &tg, &cn, odr_max(o)) <= 0)
return 0;
return 0;
if (ber_dectag(o->bp, &cl, &tg, &cn, odr_max(o)) <= 0)
return 0;
@@
-91,13
+91,13
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
void odr_choice_bias(ODR o, int what)
{
void odr_choice_bias(ODR o, int what)
{
- if (o->enable_bias)
- o->choice_bias = what;
+ if (o->op->enable_bias)
+ o->op->choice_bias = what;
}
void odr_choice_enable_bias (ODR o, int mode)
{
}
void odr_choice_enable_bias (ODR o, int mode)
{
- o->enable_bias = mode;
+ o->op->enable_bias = mode;
}
/*
* Local variables:
}
/*
* Local variables: