X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fber_any.c;h=e167d426a2b5ba1eb6b05dfbb71ef59f86eac2a0;hb=c82db01c9fc0b51254ec6ead5fe3b503ca098ca0;hp=939fb74ab38a6435e561cf9d2b98d758df1c23f4;hpb=5242cb5a8634bfa38b9333ff7f903e718ac6e292;p=yaz-moved-to-github.git diff --git a/src/ber_any.c b/src/ber_any.c index 939fb74..e167d42 100644 --- a/src/ber_any.c +++ b/src/ber_any.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2012 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ @@ -30,9 +30,12 @@ int ber_any(ODR o, Odr_any **p) odr_seterror(o, OPROTO, 2); return 0; } - (*p)->buf = (unsigned char *)odr_malloc(o, res); + (*p)->buf = (char *)odr_malloc(o, res); memcpy((*p)->buf, o->bp, res); - (*p)->len = (*p)->size = res; + (*p)->len = res; +#if OCT_SIZE + (*p)->size = res; +#endif o->bp += res; return 1; case ODR_ENCODE: @@ -45,10 +48,10 @@ int ber_any(ODR o, Odr_any **p) #define BER_ANY_DEBUG 0 -int completeBER_n(const unsigned char *buf, int len, int level) +int completeBER_n(const char *buf, int len, int level) { int res, ll, zclass, tag, cons; - const unsigned char *b = buf; + const char *b = buf; if (level > 1000) { @@ -120,7 +123,7 @@ int completeBER_n(const unsigned char *buf, int len, int level) return (b - buf) + 2; } -int completeBER(const unsigned char *buf, int len) +int completeBER(const char *buf, int len) { int res = completeBER_n(buf, len, 0); #if BER_ANY_DEBUG