projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stupid bug in odr_malloc
[yaz-moved-to-github.git]
/
odr
/
odr_int.c
diff --git
a/odr/odr_int.c
b/odr/odr_int.c
index
37c08d6
..
cad4add
100644
(file)
--- a/
odr/odr_int.c
+++ b/
odr/odr_int.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_int.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_int.c,v $
- * Revision 1.8 1995-09-27 15:02:59 quinn
+ * 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
* Modified function heads & prototypes.
*
* Revision 1.7 1995/05/16 08:50:54 quinn
@@
-31,37
+37,38
@@
*/
#include <odr.h>
*/
#include <odr.h>
+#include <prt.h>
/*
* Top level integer en/decoder.
* Returns 1 on success, 0 on error.
*/
/*
* 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)
{
int res, cons = 0;
if (o->error)
{
int res, cons = 0;
if (o->error)
- return 0;
+ return 0;
if (o->t_class < 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)
}
if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
- return 0;
+ return 0;
if (!res)
if (!res)
- return opt;
+ return opt;
if (o->direction == ODR_PRINT)
{
if (o->direction == ODR_PRINT)
{
- fprintf(o->print, "%s%d\n", odr_indent(o), **p);
- return 1;
+ fprintf(o->print, "%s%d\n", odr_indent(o), **p);
+ return 1;
}
if (cons)
{
}
if (cons)
{
- o->error = OPROTO;
- return 0;
+ o->error = OPROTO;
+ return 0;
}
if (o->direction == ODR_DECODE)
}
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(int));
+ *p = odr_malloc(o, sizeof(int));
return ber_integer(o, *p);
}
return ber_integer(o, *p);
}