X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_null.c;h=09c0f546ccbdbb60b567976f3aafa92840e4d504;hb=a200fc19301615242b43e18b9c03027d495302bb;hp=b650c87046c0300f825e998500b7206e225e5cfb;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git

diff --git a/odr/ber_null.c b/odr/ber_null.c
index b650c87..09c0f54 100644
--- a/odr/ber_null.c
+++ b/odr/ber_null.c
@@ -1,10 +1,26 @@
 /*
- * 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: ber_null.c,v $
- * Revision 1.1  1995-02-02 16:21:52  quinn
+ * Revision 1.6  1995-05-22 11:32:01  quinn
+ * Fixing Interface to odr_null.
+ *
+ * Revision 1.5  1995/05/16  08:50:46  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/04/18  08:15:16  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.3  1995/03/08  12:12:09  quinn
+ * Added better error checking.
+ *
+ * Revision 1.2  1995/02/09  15:51:46  quinn
+ * Works better now.
+ *
+ * Revision 1.1  1995/02/02  16:21:52  quinn
  * First kick.
  *
  */
@@ -14,22 +30,29 @@
 /*
  * BER-en/decoder for NULL type.
  */
-int ber_null(ODR o, int *val)
+int ber_null(ODR o)
 {
     switch (o->direction)
     {
     	case ODR_ENCODE:
-	    *(o->bp++) = 0X00;
-	    o->left--;
+	    if (odr_putc(o, 0X00) < 0)
+	    	return 0;
+#ifdef ODR_DEBUG
 	    fprintf(stderr, "[NULL]\n");
+#endif
 	    return 1;
 	case ODR_DECODE:
 	    if (*(o->bp++) != 0X00)
+	    {
+	    	o->error = OPROTO;
 	    	return 0;
+	    }
 	    o->left--;
+#ifdef ODR_DEBUG
 	    fprintf(stderr, "[NULL]\n");
+#endif
 	    return 1;
 	case ODR_PRINT: return 1;
-	default: return 0;
+	default: o->error = OOTHER; return 0;
     }
 }