X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_any.c;h=aa5b08f9c134fea1f44b6e89181923eb602303a4;hp=cfbff274022c117fceea89b0a3534b205ea617f2;hb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;hpb=892f7f56860a1ee8e8d816eeaec0387c54c1a0a7 diff --git a/odr/odr_any.c b/odr/odr_any.c index cfbff27..aa5b08f 100644 --- a/odr/odr_any.c +++ b/odr/odr_any.c @@ -1,21 +1,15 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995-2003, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: odr_any.c,v $ - * Revision 1.3 1995-03-17 10:17:46 quinn - * Added memory management. - * - * Revision 1.2 1995/03/08 12:12:18 quinn - * Added better error checking. - * - * Revision 1.1 1995/02/09 15:51:47 quinn - * Works better now. - * + * $Id: odr_any.c,v 1.12 2003-01-06 08:20:27 adam Exp $ */ +#if HAVE_CONFIG_H +#include +#endif -#include +#include "odr-priv.h" /* * This is a catch-all type. It stuffs a random ostring (assumed to be properly @@ -23,17 +17,18 @@ * does not work, and neither does the optional flag, unless the element * is the last in a sequence. */ -int odr_any(ODR o, Odr_any **p, int opt) +int odr_any(ODR o, Odr_any **p, int opt, const char *name) { if (o->error) return 0; if (o->direction == ODR_PRINT) { - fprintf(o->print, "%sANY (len=%d)\n", odr_indent(o), (*p)->len); + odr_prname(o, name); + fprintf(o->print, "ANY (len=%d)\n", (*p)->len); return 1; } if (o->direction == ODR_DECODE) - *p = odr_malloc(o, sizeof(**p)); + *p = (Odr_oct *)odr_malloc(o, sizeof(**p)); if (ber_any(o, p)) return 1; *p = 0;