X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_bool.c;h=0ea96b42e89a81bc0037c720e24f5e0620e5778f;hp=13c2d3acbdd9343209d8050efdc39635daa2c504;hb=9a13337111b32d256182a4248f93ebe26e393059;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55 diff --git a/odr/odr_bool.c b/odr/odr_bool.c index 13c2d3a..0ea96b4 100644 --- a/odr/odr_bool.c +++ b/odr/odr_bool.c @@ -1,10 +1,35 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995-2000, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_bool.c,v $ - * Revision 1.4 1995-03-08 12:12:20 quinn + * Revision 1.12 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.11 1999/11/30 13:47:11 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.10 1999/04/20 09:56:48 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.9 1998/02/11 11:53:34 adam + * Changed code so that it compiles as C++. + * + * Revision 1.8 1995/09/29 17:12:23 quinn + * Smallish + * + * Revision 1.7 1995/09/27 15:02:58 quinn + * Modified function heads & prototypes. + * + * Revision 1.6 1995/05/16 08:50:52 quinn + * License, documentation, and memory fixes + * + * Revision 1.5 1995/03/17 10:17:49 quinn + * Added memory management. + * + * Revision 1.4 1995/03/08 12:12:20 quinn * Added better error checking. * * Revision 1.3 1995/02/10 18:57:25 quinn @@ -17,15 +42,18 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include -#include +#include /* * Top level boolean en/decoder. * Returns 1 on success, 0 on error. */ -int odr_bool(ODR o, int **p, int opt) +int odr_bool(ODR o, int **p, int opt, const char *name) { int res, cons = 0; @@ -42,12 +70,13 @@ int odr_bool(ODR o, int **p, int opt) return opt; if (o->direction == ODR_PRINT) { - fprintf(o->print, "%s%s\n", odr_indent(o), (**p ? "TRUE" : "FALSE")); + odr_prname(o, name); + fprintf(o->print, "%s\n", (**p ? "TRUE" : "FALSE")); return 1; } if (cons) return 0; if (o->direction == ODR_DECODE) - *p = nalloc(o, sizeof(int)); + *p = (int *)odr_malloc(o, sizeof(int)); return ber_boolean(o, *p); }