X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_seq.c;h=577dbae6f9ab691e538eb912b7438924f212b845;hp=b73d1fdcbc958923feb31b668b4091cd1b57b581;hb=a679666e56f9f6ea19e4c22e36089ccb3716dd0f;hpb=8d691989077a0addcbd840d769dce6700f3d9622 diff --git a/src/odr_seq.c b/src/odr_seq.c index b73d1fd..577dbae 100644 --- a/src/odr_seq.c +++ b/src/odr_seq.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: odr_seq.c,v 1.6 2007-01-03 08:42:15 adam Exp $ */ /** * \file odr_seq.c @@ -20,14 +18,14 @@ int odr_sequence_begin(ODR o, void *p, int size, const char *name) 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 (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); @@ -43,14 +41,14 @@ int odr_set_begin(ODR o, void *p, int size, const char *name) 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 (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);