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
yaz-iconv: fix typos
[yaz-moved-to-github.git]
/
src
/
odr_choice.c
diff --git
a/src/odr_choice.c
b/src/odr_choice.c
index
c27ea15
..
8c6c3c8
100644
(file)
--- a/
src/odr_choice.c
+++ b/
src/odr_choice.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_choice.c,v 1.6 2005-08-11 14:21:55 adam Exp $
*/
/**
*/
/**
@@
-19,7
+17,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
+29,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)
{
@@
-58,7
+56,7
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
{
if (o->op->stack_top && !odr_constructed_more(o))
return 0;
{
if (o->op->stack_top && !odr_constructed_more(o))
return 0;
- if (ber_dectag(o->bp, &cl, &tg, &cn, odr_max(o)) <= 0)
+ if (ber_dectag(o->op->bp, &cl, &tg, &cn, odr_max(o)) <= 0)
return 0;
}
else if (o->direction != ODR_DECODE)
return 0;
}
else if (o->direction != ODR_DECODE)
@@
-91,17
+89,18
@@
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:
* c-basic-offset: 4
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab