X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fber_any.c;h=905b0c4c31db3868fbd10e32eac6cc9791aa73d1;hb=62b57dd7f9c0ee57788bbcfb1f81697900587027;hp=6f0e977e785ef7d9fa5d3344117561f111ccb7eb;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git diff --git a/src/ber_any.c b/src/ber_any.c index 6f0e977..905b0c4 100644 --- a/src/ber_any.c +++ b/src/ber_any.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. - * - * $Id: ber_any.c,v 1.6 2007-01-03 08:42:15 adam Exp $ */ /** @@ -111,10 +109,9 @@ int completeBER_n(const unsigned char *buf, int len, int level) { if (b[0] == 0 && b[1] == 0) break; - if (!(res = completeBER_n(b, len, level+1))) - return 0; - if (res == -1) - return -1; + res = completeBER_n(b, len, level+1); + if (res <= 0) + return res; b += res; len -= res; } @@ -136,6 +133,7 @@ int completeBER(const unsigned char *buf, int len) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab