X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_seq.c;h=c57172a60ad4d98dc1f28caf0c980dba20c2e8a0;hp=9230ed58c2cfab962d6ddcfe47a88daddc1d5685;hb=896b145fa7a02199bfc3e8aa824c018b9d7cbf98;hpb=b7c6d3740131ba03800c5c2cc935dc2626d12bb3 diff --git a/src/odr_seq.c b/src/odr_seq.c index 9230ed5..c57172a 100644 --- a/src/odr_seq.c +++ b/src/odr_seq.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: odr_seq.c,v 1.5 2005-08-11 14:21:55 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); @@ -147,6 +145,7 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab