X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_tag.c;h=dcfd8ae54e4a5ca3548acfc0674cc3192e70667d;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hp=9e7291aae26da73d6a125dabe137c728badc61a9;hpb=6517fa53d35512887780fd07de5667940da18a9e;p=yaz-moved-to-github.git diff --git a/odr/ber_tag.c b/odr/ber_tag.c index 9e7291a..dcfd8ae 100644 --- a/odr/ber_tag.c +++ b/odr/ber_tag.c @@ -1,10 +1,19 @@ /* - * Copyright (c) 1995-1997, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_tag.c,v $ - * Revision 1.16 1997-09-17 12:10:33 adam + * Revision 1.19 1999-01-08 11:23:25 adam + * Added const modifier to some of the BER/ODR encoding routines. + * + * Revision 1.18 1998/02/11 11:53:34 adam + * Changed code so that it compiles as C++. + * + * Revision 1.17 1997/09/30 09:33:10 adam + * Minor changes - removed indentation of ifdef. + * + * Revision 1.16 1997/09/17 12:10:33 adam * YAZ version 1.4. * * Revision 1.15 1997/09/01 08:51:06 adam @@ -74,7 +83,7 @@ int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt) { Odr_ber_tag *odr_ber_tag = &o->odr_ber_tag; int rd; - char **pp = p; + char **pp = (char **)p; if (o->direction == ODR_DECODE) *pp = 0; @@ -118,10 +127,12 @@ int ber_tag(ODR o, void *p, int zclass, int tag, int *constructed, int opt) o->error = OPROTO; return 0; } - #ifdef ODR_DEBUG - fprintf(stderr, "\n[class=%d,tag=%d,cons=%d,stackp=%d]", odr_ber_tag->lclass, odr_ber_tag->ltag, - odr_ber_tag->lcons, o->stackp); - #endif +#ifdef ODR_DEBUG + fprintf(stderr, + "\n[class=%d,tag=%d,cons=%d,stackp=%d]", + odr_ber_tag->lclass, odr_ber_tag->ltag, + odr_ber_tag->lcons, o->stackp); +#endif } if (zclass == odr_ber_tag->lclass && tag == odr_ber_tag->ltag) { @@ -191,9 +202,9 @@ int ber_enctag(ODR o, int zclass, int tag, int constructed) /* ber_dectag * Decode BER identifier octets. Return number of bytes read or -1 for error. */ -int ber_dectag(unsigned char *buf, int *zclass, int *tag, int *constructed) +int ber_dectag(const unsigned char *buf, int *zclass, int *tag, int *constructed) { - unsigned char *b = buf; + const unsigned char *b = buf; *zclass = *b >> 6; *constructed = (*b >> 5) & 0X01;