/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_int.c,v $
- * Revision 1.8 1995-09-27 15:02:59 quinn
+ * Revision 1.15 2000-02-29 13:44:55 adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.14 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.13 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.12 1999/01/08 11:23:28 adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.11 1998/02/11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10 1995/09/29 17:12:24 quinn
+ * Smallish
+ *
+ * Revision 1.9 1995/09/29 17:01:50 quinn
+ * More Windows work
+ *
+ * Revision 1.8 1995/09/27 15:02:59 quinn
* Modified function heads & prototypes.
*
* Revision 1.7 1995/05/16 08:50:54 quinn
* First kick.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include <odr.h>
+#include <yaz/odr.h>
/*
* Top level integer en/decoder.
* Returns 1 on success, 0 on error.
*/
-int MDF odr_integer(ODR o, int **p, int opt)
+int odr_integer(ODR o, int **p, int opt, const char *name)
{
int res, cons = 0;
if (o->error)
- return 0;
+ return 0;
if (o->t_class < 0)
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_INTEGER;
+ o->t_class = ODR_UNIVERSAL;
+ o->t_tag = ODR_INTEGER;
}
if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
- return 0;
+ return 0;
if (!res)
- return opt;
+ return opt;
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%s%d\n", odr_indent(o), **p);
- return 1;
+ odr_prname(o, name);
+ fprintf(o->print, "%d\n", **p);
+ return 1;
}
if (cons)
{
- o->error = OPROTO;
- return 0;
+ o->error = OPROTO;
+ return 0;
}
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(int));
+ *p = (int *)odr_malloc(o, sizeof(int));
return ber_integer(o, *p);
}