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

diff --git a/odr/ber_null.c b/odr/ber_null.c
index b650c87..3b84a1d 100644
--- a/odr/ber_null.c
+++ b/odr/ber_null.c
@@ -1,35 +1,46 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, 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
- * First kick.
- *
+ * $Id: ber_null.c,v 1.14 2003-03-11 11:03:31 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include "odr-priv.h"
 
 /*
  * 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--;
-	    fprintf(stderr, "[NULL]\n");
-	    return 1;
-	case ODR_DECODE:
-	    if (*(o->bp++) != 0X00)
-	    	return 0;
-	    o->left--;
-	    fprintf(stderr, "[NULL]\n");
-	    return 1;
-	case ODR_PRINT: return 1;
-	default: return 0;
+    case ODR_ENCODE:
+        if (odr_putc(o, 0X00) < 0)
+            return 0;
+#ifdef ODR_DEBUG
+        fprintf(stderr, "[NULL]\n");
+#endif
+        return 1;
+    case ODR_DECODE:
+        if (odr_max(o) < 1)
+        {
+            odr_seterror(o, OPROTO, 39);
+            return 0;
+        }
+        if (*(o->bp++) != 0X00)
+        {
+            odr_seterror(o, OPROTO, 12);
+            return 0;
+        }
+#ifdef ODR_DEBUG
+        fprintf(stderr, "[NULL]\n");
+#endif
+        return 1;
+    case ODR_PRINT: return 1;
+    default: odr_seterror(o, OOTHER, 13); return 0;
     }
 }