X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_len.c;h=47c6f0f2a291c330b0636d90f342bf3f18df7059;hp=eec85f4b6797783e09c17f7130da29f3966daec7;hb=11ed1645174d8ca8d8dcf5ef2bbe91e70a4a3e00;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/ber_len.c b/src/ber_len.c index eec85f4..47c6f0f 100644 --- a/src/ber_len.c +++ b/src/ber_len.c @@ -1,9 +1,9 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ -/** +/** * \file ber_len.c * \brief Implements BER length octet encoding and decoding * @@ -81,8 +81,8 @@ int ber_enclen(ODR o, int len, int lenlen, int exact) /** * ber_declen: - * Decode BER length octets. Returns - * > 0 : number of bytes read + * Decode BER length octets. Returns + * > 0 : number of bytes read * -1 : not enough room to read bytes within max bytes * -2 : other error * @@ -90,9 +90,9 @@ int ber_enclen(ODR o, int len, int lenlen, int exact) * len = -1 indefinite length. * len >= 0 definite length */ -int ber_declen(const unsigned char *buf, int *len, int max) +int ber_declen(const char *buf, int *len, int max) { - const unsigned char *b = buf; + const unsigned char *b = (const unsigned char *) buf; int n; if (max < 1) @@ -109,7 +109,7 @@ int ber_declen(const unsigned char *buf, int *len, int max) } if (*b == 0XFF) /* reserved value */ return -2; - /* indefinite long form */ + /* indefinite long form */ n = *b & 0X7F; if (n >= max) return -1; @@ -122,7 +122,7 @@ int ber_declen(const unsigned char *buf, int *len, int max) } if (*len < 0) return -2; - return (b - buf); + return ((const char *) b - buf); } /* * Local variables: