X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_tag.c;fp=odr%2Fodr_tag.c;h=288403b1e839d4a5a6ccf24e894b7292c0f2817e;hb=569f86b4615c2731727be2a0ff898d36f9725819;hp=19459c7d7397b246317db1b54b923f2fe7cd93f9;hpb=c903bb04318c52d60fd18b12aba1fe16ade8fc65;p=yaz-moved-to-github.git diff --git a/odr/odr_tag.c b/odr/odr_tag.c index 19459c7..288403b 100644 --- a/odr/odr_tag.c +++ b/odr/odr_tag.c @@ -1,48 +1,15 @@ /* - * Copyright (c) 1995-2000, Index Data + * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: odr_tag.c,v $ - * Revision 1.11 2000-02-29 13:44:55 adam - * Check for config.h (currently not generated). - * - * Revision 1.10 1999/11/30 13:47:11 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.9 1998/02/11 11:53:34 adam - * Changed code so that it compiles as C++. - * - * Revision 1.8 1997/05/14 06:53:59 adam - * C++ support. - * - * Revision 1.7 1996/02/20 12:52:54 quinn - * Added odr_peektag - * - * Revision 1.6 1995/12/14 16:28:26 quinn - * More explain stuff. - * - * Revision 1.5 1995/09/29 17:12:27 quinn - * Smallish - * - * Revision 1.4 1995/09/27 15:03:00 quinn - * Modified function heads & prototypes. - * - * Revision 1.3 1995/05/16 08:51:00 quinn - * License, documentation, and memory fixes - * - * Revision 1.2 1995/03/08 12:12:31 quinn - * Added better error checking. - * - * Revision 1.1 1995/02/02 16:21:54 quinn - * First kick. - * + * $Id: odr_tag.c,v 1.12 2002-07-25 12:51:08 adam Exp $ */ #if HAVE_CONFIG_H #include #endif -#include +#include "odr-priv.h" int odr_peektag(ODR o, int *zclass, int *tag, int *cons) { @@ -51,7 +18,7 @@ int odr_peektag(ODR o, int *zclass, int *tag, int *cons) o->error = OOTHER; return 0; } - if (o->stackp > -1 && !odr_constructed_more(o)) + if (o->op->stackp > -1 && !odr_constructed_more(o)) return 0; if (ber_dectag(o->bp, zclass, tag, cons) <= 0) {