X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_int.c;h=9ce0b448a68ff2ad67c81904bb2d5b8a51a1f0b5;hb=a200fc19301615242b43e18b9c03027d495302bb;hp=5b303b6a275b625a6fe59d924bba519ca29cb46a;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_int.c b/odr/odr_int.c
index 5b303b6..9ce0b44 100644
--- a/odr/odr_int.c
+++ b/odr/odr_int.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_int.c,v $
- * Revision 1.3  1995-02-09 15:51:48  quinn
+ * Revision 1.7  1995-05-16 08:50:54  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6  1995/03/17  10:17:51  quinn
+ * Added memory management.
+ *
+ * Revision 1.5  1995/03/08  12:12:25  quinn
+ * Added better error checking.
+ *
+ * Revision 1.4  1995/02/10  18:57:25  quinn
+ * More in the way of error-checking.
+ *
+ * Revision 1.3  1995/02/09  15:51:48  quinn
  * Works better now.
  *
  * Revision 1.2  1995/02/07  14:13:45  quinn
@@ -25,31 +37,28 @@ int odr_integer(ODR o, int **p, int opt)
 {
     int res, cons = 0;
 
+    if (o->error)
+    	return 0;
     if (o->t_class < 0)
     {
     	o->t_class = ODR_UNIVERSAL;
     	o->t_tag = ODR_INTEGER;
     }
-    if (o->direction == ODR_DECODE)
-    	*p =0;
-    if ((res = ber_tag(o, *p, o->t_class, o->t_tag, &cons)) < 0)
-    {
-    	*p = 0;
+    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt)) < 0)
     	return 0;
-    }
     if (!res)
-    {
-    	*p = 0;
     	return opt;
-    }
     if (o->direction == ODR_PRINT)
     {
     	fprintf(o->print, "%s%d\n", odr_indent(o), **p);
     	return 1;
     }
     if (cons)
+    {
+    	o->error = OPROTO;
     	return 0;
+    }
     if (o->direction == ODR_DECODE)
-    	*p = nalloc(o, sizeof(int));
+    	*p = odr_malloc(o, sizeof(int));
     return ber_integer(o, *p);
 }