X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_null.c;h=8e7d85de67da6eebe1f1056100a5db007f3b7b2a;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hp=ac26999c3d568f3d92b2d91d91e4efaf18b011e3;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git diff --git a/odr/odr_null.c b/odr/odr_null.c index ac26999..8e7d85d 100644 --- a/odr/odr_null.c +++ b/odr/odr_null.c @@ -1,39 +1,21 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: odr_null.c,v $ - * Revision 1.7 1995-09-27 15:02:59 quinn - * Modified function heads & prototypes. - * - * Revision 1.6 1995/05/22 11:32:03 quinn - * Fixing Interface to odr_null. - * - * Revision 1.5 1995/05/16 08:50:56 quinn - * License, documentation, and memory fixes - * - * Revision 1.4 1995/03/08 12:12:26 quinn - * Added better error checking. - * - * Revision 1.3 1995/02/10 18:57:25 quinn - * More in the way of error-checking. - * - * Revision 1.2 1995/02/09 15:51:49 quinn - * Works better now. - * - * Revision 1.1 1995/02/02 16:21:54 quinn - * First kick. - * + * $Id: odr_null.c,v 1.17 2003-05-20 19:55:30 adam Exp $ */ +#if HAVE_CONFIG_H +#include +#endif -#include +#include "odr-priv.h" /* * Top level null en/decoder. * Returns 1 on success, 0 on error. */ -int MDF odr_null(ODR o, Odr_null **p, int opt) +int odr_null(ODR o, Odr_null **p, int opt, const char *name) { int res, cons = 0; @@ -44,21 +26,26 @@ int MDF odr_null(ODR o, Odr_null **p, int opt) o->t_class = ODR_UNIVERSAL; o->t_tag = ODR_NULL; } - if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0) + if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0) return 0; if (!res) - return opt; + return odr_missing(o, opt, name); if (o->direction == ODR_PRINT) { - fprintf(o->print, "%sNULL\n", odr_indent(o)); + odr_prname(o, name); + fprintf(o->print, "NULL\n"); return 1; } if (cons) { - o->error = OPROTO; +#ifdef ODR_STRICT_NULL + odr_seterror(OPROTO, 42); return 0; +#else + fprintf(stderr, "odr: Warning: Bad NULL\n"); +#endif } if (o->direction == ODR_DECODE) - *p = ODR_NULLVAL; + *p = odr_nullval(); return ber_null(o); }