X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_null.c;h=bd334c924b5134c95c6924be1df206140d9a3e01;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=8543f7f62066e67dff9817b2d5561a553ada9a5a;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/ber_null.c b/odr/ber_null.c
index 8543f7f..bd334c9 100644
--- a/odr/ber_null.c
+++ b/odr/ber_null.c
@@ -1,42 +1,41 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: ber_null.c,v $
- * 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.
- *
+ * $Id: ber_null.c,v 1.12 2002-07-25 12:51:08 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--;
+    case ODR_ENCODE:
+        if (odr_putc(o, 0X00) < 0)
+            return 0;
 #ifdef ODR_DEBUG
-	    fprintf(stderr, "[NULL]\n");
+        fprintf(stderr, "[NULL]\n");
 #endif
-	    return 1;
-	case ODR_DECODE:
-	    if (*(o->bp++) != 0X00)
-	    	return 0;
-	    o->left--;
+        return 1;
+    case ODR_DECODE:
+        if (*(o->bp++) != 0X00)
+        {
+            o->error = OPROTO;
+            return 0;
+        }
 #ifdef ODR_DEBUG
-	    fprintf(stderr, "[NULL]\n");
+        fprintf(stderr, "[NULL]\n");
 #endif
-	    return 1;
-	case ODR_PRINT: return 1;
-	default: return 0;
+        return 1;
+    case ODR_PRINT: return 1;
+    default: o->error = OOTHER; return 0;
     }
 }