X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_null.c;h=6e54de3ba8fd23ba8545a197bf6f44a2fdae825e;hp=3e694b65eb82355f8c0aa1ede37a06c2e2f86b60;hb=f3fa080453f6e57618216f6e58d871fb06f0d1b6;hpb=05c274ef315384faafcc5900c17468f0ea2474e6

diff --git a/src/ber_null.c b/src/ber_null.c
index 3e694b6..6e54de3 100644
--- a/src/ber_null.c
+++ b/src/ber_null.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_null.c,v 1.2 2004-10-15 00:18:59 adam Exp $
  */
 
-/** 
+/**
  * \file ber_null.c
  * \brief Implements ber_null
  *
@@ -18,7 +16,7 @@
 
 #include "odr-priv.h"
 
-/** 
+/**
  * ber_null: BER-en/decoder for NULL type.
  */
 int ber_null(ODR o)
@@ -28,9 +26,6 @@ int ber_null(ODR o)
     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)
@@ -38,19 +33,25 @@ int ber_null(ODR o)
             odr_seterror(o, OPROTO, 39);
             return 0;
         }
-        if (*(o->bp++) != 0X00)
+        if (*(o->op->bp++) != 0X00)
         {
             odr_seterror(o, OPROTO, 12);
             return 0;
         }
-#ifdef ODR_DEBUG
-        fprintf(stderr, "[NULL]\n");
-#endif
         return 1;
     case ODR_PRINT:
-	return 1;
+        return 1;
     default:
-	odr_seterror(o, OOTHER, 13);
-	return 0;
+        odr_seterror(o, OOTHER, 13);
+        return 0;
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+