X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_int.c;h=46422d37908ff1d416b3a581310dcc656c57e826;hb=63cfdc4bcf039bad895e9d1bbbaa72e7714b59bc;hp=d259da33595d58df90fdb65c6d39d8c0f68e91f1;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git

diff --git a/odr/ber_int.c b/odr/ber_int.c
index d259da3..46422d3 100644
--- a/odr/ber_int.c
+++ b/odr/ber_int.c
@@ -4,16 +4,33 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_int.c,v $
- * Revision 1.1  1995-02-02 16:21:52  quinn
+ * Revision 1.6  1995-04-18 08:15:14  quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.5  1995/03/27  15:01:44  quinn
+ * Added include of sys/types to further portability
+ *
+ * Revision 1.4  1995/03/08  12:12:07  quinn
+ * Added better error checking.
+ *
+ * Revision 1.3  1995/02/09  15:51:46  quinn
+ * Works better now.
+ *
+ * Revision 1.2  1995/02/07  17:52:58  quinn
+ * A damn mess, but now things work, I think.
+ *
+ * Revision 1.1  1995/02/02  16:21:52  quinn
  * First kick.
  *
  */
 
 #include <odr.h>
-#include <netinet/in.h>
+#include <sys/types.h>
+#include <netinet/in.h>  /* for htons... */
 #include <string.h>
 
-static int ber_encinteger(unsigned char *buf, int val, int maxlen);
+static int ber_encinteger(ODR o, int val);
 static int ber_decinteger(unsigned char *buf, int *val);
 
 int ber_integer(ODR o, int *val)
@@ -24,47 +41,51 @@ int ber_integer(ODR o, int *val)
     {
     	case ODR_DECODE:
 	    if ((res = ber_decinteger(o->bp, val)) <= 0)
+	    {
+	    	o->error = OPROTO;
 	    	return 0;
+	    }
 	    o->bp += res;
 	    o->left -= res;
 	    return 1;
     	case ODR_ENCODE:
-	    if ((res = ber_encinteger(o->bp, *val, o->left)) <= 0)
+	    if ((res = ber_encinteger(o, *val)) < 0)
 	    	return 0;
-	    o->bp += res;
-	    o->left -= res;
 	    return 1;
     	case ODR_PRINT: return 1;
-    	default:  return 0;
+    	default: o->error = OOTHER;  return 0;
     }
 }
 
 /*
  * Returns: number of bytes written or -1 for error (out of bounds).
  */
-int ber_encinteger(unsigned char *buf, int val, int maxlen)
+int ber_encinteger(ODR o, int val)
 {
-    unsigned char *b = buf, *lenpos;
+    int lenpos;
     int a, len;
     union { int i; unsigned char c[sizeof(int)]; } tmp;
 
-    lenpos = b;
-    maxlen--;
-    b++;
+    lenpos = odr_tell(o);
+    if (odr_putc(o, 0) < 0)  /* dummy */
+    	return -1;
 
     tmp.i = htonl(val);   /* ensure that that we're big-endian */
     for (a = 0; a < sizeof(int) - 1; a++)  /* skip superfluous octets */
     	if (!((tmp.c[a] == 0 && !(tmp.c[a+1] & 0X80)) ||
 	    (tmp.c[a] == 0XFF && (tmp.c[a+1] & 0X80))))
 	    break;
-    if ((len = sizeof(int) - a) > maxlen)
+    len = sizeof(int) - a;
+    if (odr_write(o, (unsigned char*) tmp.c + a, len) < 0)
     	return -1;
-    memcpy(b, tmp.c + a, len);
-    b += len;
-    if (ber_enclen(lenpos, len, 1, 1) != 1)
+    odr_seek(o, ODR_S_SET, lenpos);
+    if (ber_enclen(o, len, 1, 1) != 1)
     	return -1;
-    fprintf(stderr, "[val=%d]\n", val);
-    return b - buf;
+    odr_seek(o, ODR_S_END, 0);
+#ifdef ODR_DEBUG
+    fprintf(stderr, "[val=%d]", val);
+#endif
+    return 0;
 }
 
 /*
@@ -92,6 +113,8 @@ int ber_decinteger(unsigned char *buf, int *val)
     *val = ntohl(tmp.i);
 
     b += len;
-    fprintf(stderr, "[val=%d]\n", *val);
+#ifdef ODR_DEBUG
+    fprintf(stderr, "[val=%d]", *val);
+#endif
     return b - buf;
 }